Add install-debug rules. This fix the "make install" problem with

debug version builds. Fixed The debug rule in src/input.

CVS patchset: 85
CVS date: 2001/05/26 22:04:38

17 files changed, 62 insertions, 3 deletions

diff --git a/Makefile.am b/Makefile.am
index 1a92cc99d..9b9d4b7d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,10 @@ debug:
 	  (cd $$subdir && $(MAKE) $@) \
 	done;
 
+install-debug: debug
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  (cd $$subdir && $(MAKE) $@) \
+	done;
 
 prune-cache:
 	-rm -f config.cache
diff --git a/configure.in b/configure.in
index ede40b13b..e7b58c067 100644
--- a/configure.in
+++ b/configure.in
@@ -362,6 +362,15 @@ AC_SUBST(XINE_PLUGINDIR)
 AC_SUBST(XINE_DEMUXDIR)
 AC_SUBST(XINE_SKINDIR)
 
+dnl
+dnl Some informations about xine-lib compilation
+dnl
+XINE_BUILD_CC="`$CC -v 2>&1 | tail -1`"
+XINE_BUILD_OS="`uname -s -r -m`"
+XINE_BUILD_DATE="`date`"
+AC_SUBST(XINE_BUILD_CC)
+AC_SUBST(XINE_BUILD_OS)
+AC_SUBST(XINE_BUILD_DATE)
 
 dnl
 dnl For win32 libraries location, needed by libw32dll.
diff --git a/include/Makefile.am b/include/Makefile.am
index 25558f55b..2ae9ff48a 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -16,6 +16,10 @@ xine.h: xine.h.tmpl
 
 debug:
 
+
+install-debug: install
+
+
 mostlyclean-generic:
 	-rm -f *~ \#* .*~ .\#* 
 
diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in
index 0aa579b22..8d7413875 100644
--- a/include/xine.h.tmpl.in
+++ b/include/xine.h.tmpl.in
@@ -29,7 +29,7 @@
    \endverbatim
  */
 /*
- * $Id: xine.h.tmpl.in,v 1.17 2001/05/22 13:26:06 f1rmb Exp $
+ * $Id: xine.h.tmpl.in,v 1.18 2001/05/26 22:04:38 f1rmb Exp $
  *
  */
 
@@ -50,6 +50,10 @@
 #define XINE_SUB_VERSION   @XINE_SUB@
 /** @} end of versgroup */
 
+#define XINE_BUILD_CC "@XINE_BUILD_CC@"
+#define XINE_BUILD_OS "@XINE_BUILD_OS@"
+#define XINE_BUILD_DATE "@XINE_BUILD_DATE@"
+
 #ifndef DOC_HIDDEN
 typedef void ao_functions_t;
 typedef void xine_t;
diff --git a/m4/Makefile.am b/m4/Makefile.am
index ecad1ffc2..a29da33ae 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -8,6 +8,7 @@ EXTRA_DIST = _xine.m4 alsa.m4 esd.m4 $(m4data_DATA)
 
 debug:
 
+install-debug: install
 
 mostlyclean-generic:
 	-rm -f *~ \#* .*~ .\#*
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 14efe45d9..e0842b465 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -10,6 +10,8 @@ data_DATA = xine_logo.png
 
 debug:
 
+install-debug: install
+
 mostlyclean-generic:
 	-rm -f *~ \#* .*~ .\#* 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f4864d330..c0764a929 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,6 +7,10 @@ debug:
 	  (cd $$subdir && $(MAKE) $@) \
 	done;
 
+install-debug: debug
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  (cd $$subdir && $(MAKE) $@) \
+	done;
 
 mostlyclean-generic:
 	-rm -f *~ \#* .*~ .\#* 
diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index 1b82e5da1..c250b5aa2 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -45,6 +45,10 @@ debug:
 	$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
 
 
+install-debug: debug
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+
 mostlyclean-generic:
 	-rm -f *~ \#* .*~ .\#*
 
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 2fe2bfefc..1df89f6af 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -56,6 +56,9 @@ uninstall-includeHEADERS:
 debug:
 	$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
 
+install-debug: debug
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
 mostlyclean-generic:
 	-rm -f *~ \#* .*~ .\#*
 
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index dae4648bd..107e9066e 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -64,7 +64,10 @@ uninstall-includeHEADERS:
 
 
 debug:
-	$(MAKE) CFLAGS="-D_FILE_OFFSET_BITS=64 -Wall -DDEBUG -g"
+	$(MAKE) CFLAGS="-D_FILE_OFFSET_BITS=64 -Wall -DDEBUG -g -DXINE_COMPILE"
+
+install-debug: debug
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 mostlyclean-generic:
 	-rm -f *~ \#* .*~ .\#*
diff --git a/src/libac3/Makefile.am b/src/libac3/Makefile.am
index 0e1d6d37a..523e368aa 100644
--- a/src/libac3/Makefile.am
+++ b/src/libac3/Makefile.am
@@ -43,6 +43,9 @@ uninstall-includeHEADERS:
 debug:
 	$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
 
+install-debug: debug
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
 mostlyclean-generic:
 	-rm -f *~ \#* .*~ .\#*
 
diff --git a/src/libmpeg2/Makefile.am b/src/libmpeg2/Makefile.am
index 3faea8fc9..88d0d731e 100644
--- a/src/libmpeg2/Makefile.am
+++ b/src/libmpeg2/Makefile.am
@@ -20,6 +20,9 @@ noinst_HEADERS = vlc.h mpeg2.h mpeg2_internal.h
 debug:
 	$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
 
+install-debug: debug
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
 mostlyclean-generic:
 	-rm -f *~ \#* .*~ .\#*
 
diff --git a/src/libmpg123/Makefile.am b/src/libmpg123/Makefile.am
index 883770965..854b992b1 100644
--- a/src/libmpg123/Makefile.am
+++ b/src/libmpg123/Makefile.am
@@ -14,6 +14,9 @@ noinst_HEADERS = huffman.h mpg123.h mpglib.h l2tables.h
 debug:
 	$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
 
+install-debug: debug
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
 mostlyclean-generic:
 	-rm -f *~ \#* .*~ .\#*
 
diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am
index 0a4928288..0951814c2 100644
--- a/src/libspudec/Makefile.am
+++ b/src/libspudec/Makefile.am
@@ -11,6 +11,9 @@ noinst_HEADERS = spudec.h
 debug:
 	$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
 
+install-debug: debug
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
 mostlyclean-generic:
 	-rm -f *~ \#* .*~ .\#*
 
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index a825428c0..20e02ce38 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -39,6 +39,9 @@ stubs.lo: stubs.s
 debug:
 	$(MAKE) CFLAGS="$(CFLAGS) -g -DSTATIC_WIN32_PATH"
 
+install-debug: debug
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
 mostlyclean-generic:
 	-rm -f *~ \#* .*~ .\#*
 
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 90cf8f3e4..179e1e263 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -38,6 +38,9 @@ include_HEADERS = video_out_x11.h
 debug:
 	$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
 
+install-debug: debug
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
 ###
 # Install header files (default=$includedir/xine)
 #
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 3dda77ead..915e33677 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -43,9 +43,12 @@ cpu_accel.lo: cpu_accel.c
 debug:
 	$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
 
+install-debug: debug
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
 
 libsdeps:
-	@cd $(top_builddir)/src/libmpg123 && $(MAKE) libmpg123.la
+	@cd $(top_builddir)/src/libmpg123 && $(MAKE) CFLAGS="$(CFLAGS)" libmpg123.la
 ##	@cd $(top_builddir)/src/libspudec && $(MAKE) libspudec.la