diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-10-13 17:51:38 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-10-13 17:51:38 +0000 |
| commit | 631714140e6e95d3d8c7f7db6ae66ed12684fe55 (patch) | |
| tree | 6681ddb365acedecf7d98abacfcf2d281a76a1fa /src/input/vcd/libcdio | |
| parent | 19c6f41677d05b4ea60dc5f74172f130699c9587 (diff) | |
| download | xine-lib-631714140e6e95d3d8c7f7db6ae66ed12684fe55.tar.gz xine-lib-631714140e6e95d3d8c7f7db6ae66ed12684fe55.tar.bz2 | |
* use Makefile.common for global targets
* small changes to ensure, vcd files are packaged even with --disable-vcdnav
CVS patchset: 5515
CVS date: 2003/10/13 17:51:38
Diffstat (limited to 'src/input/vcd/libcdio')
| -rw-r--r-- | src/input/vcd/libcdio/Makefile.am | 27 | ||||
| -rw-r--r-- | src/input/vcd/libcdio/cdio/Makefile.am | 13 |
2 files changed, 6 insertions, 34 deletions
diff --git a/src/input/vcd/libcdio/Makefile.am b/src/input/vcd/libcdio/Makefile.am index eef45b69f..ee975a0c3 100644 --- a/src/input/vcd/libcdio/Makefile.am +++ b/src/input/vcd/libcdio/Makefile.am @@ -1,6 +1,7 @@ +include $(top_srcdir)/misc/Makefile.common + SUBDIRS = cdio -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic INCLUDES = $(LIBCDIO_CFLAGS) libcdio_SRCS = \ @@ -26,9 +27,10 @@ libiso9660_SRCS = \ iso9660_fs.c \ xa.c +EXTRA_DIST = $(libcdio_SRCS) $(libiso9660_SRCS) + if ENABLE_VCDX if HAVE_VCDNAV -EXTRA_DIST = $(libcdio_SRCS) $(libio9660_SRCS) else noinst_LTLIBRARIES = libcdio.la libiso9660.la libcdio_la_SOURCES = $(libcdio_SRCS) @@ -48,24 +50,3 @@ noinst_HEADERS = \ cdio_private.h \ _cdio_stream.h \ iso9660_private.h - - -debug: - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit;\ - done; - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit;\ - done; - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/input/vcd/libcdio/cdio/Makefile.am b/src/input/vcd/libcdio/cdio/Makefile.am index e2564e9bd..8381d9c31 100644 --- a/src/input/vcd/libcdio/cdio/Makefile.am +++ b/src/input/vcd/libcdio/cdio/Makefile.am @@ -1,12 +1,3 @@ -noinst_HEADERS = cdio.h cd_types.h iso9660.h logging.h sector.h types.h util.h version.h xa.h - -debug: -install-debug: install +include $(top_srcdir)/misc/Makefile.common -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in +noinst_HEADERS = cdio.h cd_types.h iso9660.h logging.h sector.h types.h util.h version.h xa.h |