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

11 files changed, 37 insertions, 2 deletions

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