From b860f2599f15279ab7f901299c91e4459f8fbc02 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Tue, 14 Nov 2006 01:24:10 +0000 Subject: [PATCH] Adapted libisofs build system to separate tree --- Makefile.am | 117 +-------------------------------------------------- configure.ac | 7 ++- 2 files changed, 5 insertions(+), 119 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3440163..6f7116b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,68 +1,11 @@ pkgconfigdir=$(libdir)/pkgconfig -libincludedir=$(includedir)/libburn +libincludedir=$(includedir)/libisofs -lib_LTLIBRARIES = libburn/libburn.la libisofs/libisofs.la +lib_LTLIBRARIES = libisofs/libisofs.la ## ========================================================================= ## # Build libraries -libburn_libburn_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libburn_libburn_la_LIBADD = $(LIBBURN_ARCH_LIBS) $(THREAD_LIBS) -libburn_libburn_la_SOURCES = \ - libburn/async.c \ - libburn/async.h \ - libburn/back_hacks.h \ - libburn/cleanup.c \ - libburn/cleanup.h \ - libburn/crc.c \ - libburn/crc.h \ - libburn/debug.c \ - libburn/debug.h \ - libburn/drive.c \ - libburn/drive.h \ - libburn/error.h \ - libburn/file.c \ - libburn/file.h \ - libburn/init.c \ - libburn/init.h \ - libburn/lec.c \ - libburn/lec.h \ - libburn/libburn.h \ - libburn/libdax_audioxtr.h \ - libburn/libdax_audioxtr.c \ - libburn/libdax_msgs.h \ - libburn/libdax_msgs.c \ - libburn/mmc.c \ - libburn/mmc.h \ - libburn/null.c \ - libburn/null.h \ - libburn/options.c \ - libburn/options.h \ - libburn/read.c \ - libburn/read.h \ - libburn/sbc.c \ - libburn/sbc.h \ - libburn/sector.c \ - libburn/sector.h \ - libburn/sg.c \ - libburn/sg.h \ - libburn/source.h \ - libburn/source.c \ - libburn/spc.c \ - libburn/spc.h \ - libburn/structure.c \ - libburn/structure.h \ - libburn/toc.c \ - libburn/toc.h \ - libburn/transport.h \ - libburn/util.c \ - libburn/util.h \ - libburn/write.c \ - libburn/write.h \ - version.h - -## libburn/sg-@ARCH@.c \ libisofs_libisofs_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @@ -89,57 +32,18 @@ libisofs_libisofs_la_SOURCES = \ libisofs/hash.c libinclude_HEADERS = \ - libburn/libburn.h \ libisofs/libisofs.h ## ========================================================================= ## ## Build test applications noinst_PROGRAMS = \ - test/libburner \ - test/dewav \ - test/fake_au \ test/iso \ - test/poll \ - test/toc \ - test/structest -bin_PROGRAMS = \ - cdrskin/cdrskin - -test_libburner_CPPFLAGS = -Ilibburn -test_libburner_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) -test_libburner_SOURCES = test/libburner.c -test_dewav_CPPFLAGS = -Ilibburn -test_dewav_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) -test_dewav_SOURCES = test/dewav.c -test_fake_au_CPPFLAGS = -test_fake_au_LDADD = -test_fake_au_SOURCES = test/fake_au.c -test_poll_CPPFLAGS = -Ilibburn -test_poll_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) -test_poll_SOURCES = test/poll.c -test_toc_CPPFLAGS = -Ilibburn -test_toc_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) -test_toc_SOURCES = test/toc.c -test_structest_CPPFLAGS = -Ilibburn -test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) -test_structest_SOURCES = test/structest.c test_iso_CPPFLAGS = -Ilibisofs test_iso_LDADD = $(libisofs_libisofs_la_OBJECTS) $(THREAD_LIBS) test_iso_SOURCES = test/iso.c -## cdrskin construction site - ts A60816 -cdrskin_cdrskin_CPPFLAGS = -Ilibburn -cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_2_3 -cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) -cdrskin_cdrskin_SOURCES = cdrskin/cdrskin.c cdrskin/cdrfifo.c cdrskin/cdrfifo.h cdrskin/cdrskin_timestamp.h -## cdrskin_cdrskin_SOURCES = cdrskin/cdrskin.c cdrskin/cdrfifo.c cdrskin/cdrfifo.h cdrskin/cleanup.c cdrskin/cleanup.h cdrskin/cdrskin_timestamp.h -## -## Open questions: how to compute $timestamp and express -DX="$timestamp" -## - - ## ========================================================================= ## @@ -175,11 +79,6 @@ uninstall-local: # Indent source files indent_files = \ $(libisofs_libisofs_la_SOURCES) \ - $(libburn_libburn_la_SOURCES) \ - $(test_libburner_SOURCES) \ - $(test_poll_SOURCES) \ - $(test_toc_SOURCES) \ - $(test_structest_SOURCES) \ $(test_iso_SOURCES) @@ -196,11 +95,9 @@ indent: $(indent_files) # Extra things nodist_pkgconfig_DATA = \ - libburn-1.pc \ libisofs-1.pc EXTRA_DIST = \ - libburn-1.pc.in \ libisofs-1.pc.in \ version.h.in \ doc/comments \ @@ -209,15 +106,5 @@ EXTRA_DIST = \ AUTHORS \ CONTRIBUTORS \ COPYRIGHT \ - cdrskin/README \ - cdrskin/cdrecord_spy.sh \ - cdrskin/compile_cdrskin.sh \ - cdrskin/changelog.txt \ - cdrskin/cdrskin_eng.html \ - cdrskin/wiki_plain.txt \ - cdrskin/cleanup.h \ - cdrskin/cleanup.c \ - libburn/sg-freebsd.c \ - libburn/sg-linux.c \ COPYING diff --git a/configure.ac b/configure.ac index 29113dd..c02bf34 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libburn], [0.2.3], [http://libburn.pykix.org]) +AC_INIT([libisofs], [0.3.2], [http://libburn.pykix.org]) AC_PREREQ([2.50]) dnl AC_CONFIG_HEADER([config.h]) @@ -24,8 +24,8 @@ dnl dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match dnl BURN_MAJOR_VERSION=0 -BURN_MINOR_VERSION=2 -BURN_MICRO_VERSION=3 +BURN_MINOR_VERSION=3 +BURN_MICRO_VERSION=2 BURN_INTERFACE_AGE=0 BURN_BINARY_AGE=0 BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION @@ -111,7 +111,6 @@ AC_CONFIG_FILES([ Makefile doc/doxygen.conf version.h - libburn-1.pc libisofs-1.pc ]) AC_OUTPUT