as announced on xine-devel, this is the big Makefile refactoring:

extracted some common targets and variables into a common Makefile
which is then included

CVS patchset: 4844
CVS date: 2003/05/14 16:21:44

8 files changed, 14 insertions, 143 deletions

diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 9c745ffeb..d6ee1cb66 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/misc/Makefile.common
+
 SUBDIRS = libdha vidix
 
 EXTRA_DIST = video_out_directfb.c video_out_opengl.c
@@ -9,12 +11,6 @@ AM_CFLAGS = $(X_CFLAGS) \
 	-DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) \
 	$(AALIB_CFLAGS) $(MLIB_CFLAGS)
 
-DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) \
-	-DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) \
-	$(AALIB_CFLAGS) $(MLIB_CFLAGS)
-
-LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
-
 libdir = $(XINE_PLUGINDIR)
 
 if HAVE_X11
@@ -64,7 +60,6 @@ endif
 lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(aa_module) $(pgx64_module) \
 	$(vidix_module) $(fb_module) $(sdl_module) $(syncfb_module) \
 	xineplug_vo_out_none.la
-XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
 
 xineplug_vo_out_xv_la_SOURCES = deinterlace.c alphablend.c video_out_xv.c
 xineplug_vo_out_xv_la_LIBADD = \
@@ -122,44 +117,3 @@ xineplug_vo_out_none_la_SOURCES =  video_out_none.c
 xineplug_vo_out_none_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 noinst_HEADERS = alphablend.h deinterlace.h video_out_syncfb.h yuv2rgb.h 
-
-$(XINE_LIB):
-	@cd $(top_builddir)/src/xine-engine && $(MAKE)
-
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) -DXINE_COMPILE"
-
-install-debug: debug
-	@list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) $@) || exit;\
-	done;
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-###
-# Install header files (default=$includedir/xine)
-#
-install-includeHEADERS: $(include_HEADERS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)/xine
-	@list='$(include_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \
-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \
-	done
-
-###
-# Remove them
-#
-uninstall-includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(include_HEADERS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(includedir)/xine/$$p; \
-	done
-
-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/video_out/libdha/Makefile.am b/src/video_out/libdha/Makefile.am
index fb59a4f7a..d6f870384 100644
--- a/src/video_out/libdha/Makefile.am
+++ b/src/video_out/libdha/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/misc/Makefile.common
+
 EXTRA_DIST = README pci_db2c.awk
 
 SUBDIRS = bin kernelhelper oth sysdep
@@ -36,21 +38,3 @@ pci_names.lo: $(awk_generated)
 	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
 	$(CCDEPMODE) $(depcomp) \
 	$(LTCOMPILE) -c -o $@ `test -f $*.c || echo '$(srcdir)/'`$*.c
-
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) @STATIC@ -DXINE_COMPILE"
-
-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 *~ \#* .*~ .\#* test
-	-rm -f $(awk_generated)
-
-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/video_out/libdha/bin/Makefile.am b/src/video_out/libdha/bin/Makefile.am
index 88eac9aca..24c6d3abf 100644
--- a/src/video_out/libdha/bin/Makefile.am
+++ b/src/video_out/libdha/bin/Makefile.am
@@ -1,12 +1,3 @@
-EXTRA_DIST = README  mapdev.copyright  mapdev.vxd
-
-debug:
-install-debug:
+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
+EXTRA_DIST = README  mapdev.copyright  mapdev.vxd
diff --git a/src/video_out/libdha/kernelhelper/Makefile.am b/src/video_out/libdha/kernelhelper/Makefile.am
index 772bec98b..82a37eae3 100644
--- a/src/video_out/libdha/kernelhelper/Makefile.am
+++ b/src/video_out/libdha/kernelhelper/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_srcdir)/misc/Makefile.common
 
 EXTRA_DIST = README dhahelper.c
 
@@ -50,14 +51,3 @@ uninstall-local:
 @BUILD_DHA_KMOD_TRUE@	  echo "rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
 @BUILD_DHA_KMOD_TRUE@	  rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 @BUILD_DHA_KMOD_TRUE@	done
-
-debug:
-install-debug: install
-
-mostlyclean-generic:
-	-rm -f *~ \#* .*~ .\#* test
-
-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/video_out/libdha/oth/Makefile.am b/src/video_out/libdha/oth/Makefile.am
index 9d9956b41..55651d233 100644
--- a/src/video_out/libdha/oth/Makefile.am
+++ b/src/video_out/libdha/oth/Makefile.am
@@ -1,12 +1,3 @@
-EXTRA_DIST = pci.db
-
-debug:
-install-debug:
+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
+EXTRA_DIST = pci.db
diff --git a/src/video_out/libdha/sysdep/Makefile.am b/src/video_out/libdha/sysdep/Makefile.am
index 014ef0cf0..807572c39 100644
--- a/src/video_out/libdha/sysdep/Makefile.am
+++ b/src/video_out/libdha/sysdep/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/misc/Makefile.common
+
 EXTRA_DIST = \
 	libdha_os2.c \
 	libdha_win32.c \
@@ -31,14 +33,3 @@ noinst_HEADERS = \
 	AsmMacros_powerpc.h \
 	AsmMacros_sparc.h \
 	AsmMacros_x86.h
-
-debug:
-install-debug:
-
-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/video_out/vidix/Makefile.am b/src/video_out/vidix/Makefile.am
index 3c1461e48..7621a035a 100644
--- a/src/video_out/vidix/Makefile.am
+++ b/src/video_out/vidix/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/misc/Makefile.common
+
 EXTRA_DIST = README vidix.txt
 
 SUBDIRS = drivers
@@ -17,20 +19,3 @@ noinst_HEADERS = fourcc.h vidix.h vidixlib.h
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \
 	-I$(top_srcdir)/src/video_out/libdha
-
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) @STATIC@ -DXINE_COMPILE"
-
-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/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am
index e2843305c..016c3f954 100644
--- a/src/video_out/vidix/drivers/Makefile.am
+++ b/src/video_out/vidix/drivers/Makefile.am
@@ -1,8 +1,7 @@
+include $(top_srcdir)/misc/Makefile.common
 
 EXTRA_DIST = genfb_vid.c nvidia_vid.c
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
-
 libdir = $(XINE_PLUGINDIR)/vidix
 
 if HAVE_VIDIX
@@ -81,17 +80,3 @@ noinst_HEADERS = mach64.h nvidia.h glint_regs.h pm3_regs.h radeon.h \
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \
 	-I$(top_srcdir)/src/video_out/libdha
-
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) -DXINE_COMPILE"
-
-install-debug: debug
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-mostlyclean-generic:
-	-rm -f *~ \#* .*~ .\#* rage128_vid.c mga_crtc2_vid.c
-
-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