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

7 files changed, 9 insertions, 132 deletions

diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am
index 2c0f6a74b..a27478a5a 100644
--- a/src/libffmpeg/libavcodec/Makefile.am
+++ b/src/libffmpeg/libavcodec/Makefile.am
@@ -1,6 +1,4 @@
-##
-## Process this file with automake to produce Makefile.in
-##
+include $(top_srcdir)/misc/Makefile.common
 
 SUBDIRS = armv4l i386 mlib alpha libpostproc
 
@@ -13,8 +11,6 @@ EXTRA_DIST = fdctref.c imgresample.c motion_est_template.c svq3.c wmv2.c \
 AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -DCONFIG_RISKY
 ASFLAGS =
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
-
 noinst_LTLIBRARIES = libavcodec.la
 
 libavcodec_la_SOURCES = \
@@ -83,20 +79,3 @@ noinst_HEADERS = \
 
 .s.lo:
 	$(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-debug:
-	@list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) $@) || exit;\
-	done;
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)"
-
-install-debug: debug
-	@$(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/libffmpeg/libavcodec/alpha/Makefile.am b/src/libffmpeg/libavcodec/alpha/Makefile.am
index 372f030d8..90fbf4c23 100644
--- a/src/libffmpeg/libavcodec/alpha/Makefile.am
+++ b/src/libffmpeg/libavcodec/alpha/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/misc/Makefile.common
+
 EXTRA_DIST = asm.h \
 	dsputil_alpha.c \
 	mpegvideo_alpha.c \
@@ -6,19 +8,3 @@ EXTRA_DIST = asm.h \
 	regdef.h \
 	dsputil_alpha_asm.S \
 	simple_idct_alpha.c
-
-all:
-
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)"
-
-install-debug: debug
-	@$(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/libffmpeg/libavcodec/armv4l/Makefile.am b/src/libffmpeg/libavcodec/armv4l/Makefile.am
index 833d96068..e8b811d1a 100644
--- a/src/libffmpeg/libavcodec/armv4l/Makefile.am
+++ b/src/libffmpeg/libavcodec/armv4l/Makefile.am
@@ -1,12 +1,8 @@
-##
-## Process this file with automake to produce Makefile.in
-##
+include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS = -O2 $(LIBFFMPEG_CFLAGS)
 ASFLAGS =
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
-
 noinst_LTLIBRARIES = libavcodec_armv4l.la
 
 libavcodec_armv4l_src = dsputil_arm.c jrevdct_arm.S 
@@ -24,17 +20,3 @@ noinst_HEADERS =
 
 .s.lo:
 	$(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)"
-
-install-debug: debug
-	@$(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/libffmpeg/libavcodec/i386/Makefile.am b/src/libffmpeg/libavcodec/i386/Makefile.am
index 58fa8c47e..34fc82988 100644
--- a/src/libffmpeg/libavcodec/i386/Makefile.am
+++ b/src/libffmpeg/libavcodec/i386/Makefile.am
@@ -1,9 +1,5 @@
-##
-## Process this file with automake to produce Makefile.in
-##
+include $(top_srcdir)/misc/Makefile.common
 
-# we must not use CFLAGS here, gcc optimizations produce
-# bad code if we do so.
 AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
 # CFLAGS is here to filter out -funroll-loops because it causes bad
 # behavior of libavcodec
@@ -11,8 +7,6 @@ CFLAGS = `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'`
 
 ASFLAGS =
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
-
 noinst_LTLIBRARIES = libavcodec_mmx.la
 
 libavcodec_mmx_src = \
@@ -43,17 +37,3 @@ noinst_HEADERS = dsputil_mmx_avg.h dsputil_mmx_rnd.h mmx.h
 
 .s.lo:
 	$(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)"
-
-install-debug: debug
-	@$(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/libffmpeg/libavcodec/libpostproc/Makefile.am b/src/libffmpeg/libavcodec/libpostproc/Makefile.am
index 10328eeff..60aa5f9a3 100644
--- a/src/libffmpeg/libavcodec/libpostproc/Makefile.am
+++ b/src/libffmpeg/libavcodec/libpostproc/Makefile.am
@@ -1,8 +1,8 @@
+include $(top_srcdir)/misc/Makefile.common
+
 AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
 ASFLAGS =
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
-
 noinst_LTLIBRARIES = libpostprocess.la
 
 EXTRA_DIST = postprocess_template.c
@@ -13,17 +13,3 @@ noinst_HEADERS = mangle.h postprocess.h postprocess_internal.h
 
 .s.lo:
 	$(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)"
-
-install-debug: debug
-	@$(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/libffmpeg/libavcodec/mlib/Makefile.am b/src/libffmpeg/libavcodec/mlib/Makefile.am
index e3c632577..73f2495d6 100644
--- a/src/libffmpeg/libavcodec/mlib/Makefile.am
+++ b/src/libffmpeg/libavcodec/mlib/Makefile.am
@@ -1,12 +1,8 @@
-##
-## Process this file with automake to produce Makefile.in
-##
+include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
 ASFLAGS =
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
-
 noinst_LTLIBRARIES = libavcodec_mlib.la
 
 libavcodec_mlib_src = dsputil_mlib.c
@@ -24,17 +20,3 @@ noinst_HEADERS =
 
 .s.lo:
 	$(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS) -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H"
-
-install-debug: debug
-	@$(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/libffmpeg/libavcodec/ppc/Makefile.am b/src/libffmpeg/libavcodec/ppc/Makefile.am
index bb4618713..781df406c 100644
--- a/src/libffmpeg/libavcodec/ppc/Makefile.am
+++ b/src/libffmpeg/libavcodec/ppc/Makefile.am
@@ -1,6 +1,4 @@
-##
-## Process this file with automake to produce Makefile.in
-##
+include $(top_srcdir)/misc/Makefile.common
 
 # we must not use CFLAGS here, gcc optimizations produce
 # bad code if we do so.
@@ -8,8 +6,6 @@ AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
 
 ASFLAGS =
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
-
 noinst_LTLIBRARIES = libavcodec_ppc.la
 
 libavcodec_ppc_src =  dsputil_altivec.c \
@@ -34,17 +30,3 @@ noinst_HEADERS = dsputil_altivec.h dsputil_ppc.h
 
 .s.lo:
 	$(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)"
-
-install-debug: debug
-	@$(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