Another pass at cleaning up Makefile.am files. More to come.

6 files changed, 87 insertions, 94 deletions

diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 3e080f84e..efea3f3b7 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -1,15 +1,30 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
-AM_LDFLAGS = $(xineplug_ldflags)
+AM_CFLAGS    = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_LDFLAGS   = $(xineplug_ldflags)
 AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 
-SUBDIRS = libdha vidix macosx
+SUBDIRS = 
+
+if BUILD_DHA_KMOD
+SUBDIRS += libdha
+endif
+
+# vidix depends on portions of dha
+if HAVE_VIDIX
+if !BUILD_DHA_KMOD
+SUBDIRS += libdha
+endif
+SUBDIRS += vidix
+endif
+
+if HAVE_MACOSX_VIDEO
+SUBDIRS += macosx
+endif
 
 EXTRA_DIST = video_out_directfb.c video_out_directfb_fb.c video_out_directfb_x.c video_out_directx.c video_out_macosx.m
 
-VIDIX_CPPFLAGS = -I$(top_builddir)/src/video_out/vidix \
-	-I$(top_srcdir)/src/video_out/vidix
+noinst_HEADERS = deinterlace.h video_out_syncfb.h yuv2rgb.h x11osd.h xcbosd.h
 
 if HAVE_X11
 X11OSD = x11osd.c
@@ -152,7 +167,9 @@ xineplug_vo_out_vidix_la_SOURCES = video_out_vidix.c $(X11OSD)
 xineplug_vo_out_vidix_la_LIBADD =  $(XINE_LIB) $(X_LIBS) \
 	$(top_builddir)/src/video_out/vidix/libvidix.la $(PTHREAD_LIBS)
 xineplug_vo_out_vidix_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) -fno-strict-aliasing
-xineplug_vo_out_vidix_la_CPPFLAGS = $(VIDIX_CPPFLAGS)
+xineplug_vo_out_vidix_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/video_out/vidix \
+	-I$(top_srcdir)/src/video_out/vidix
+
 
 xineplug_vo_out_aa_la_SOURCES =  video_out_aa.c
 xineplug_vo_out_aa_la_LIBADD = $(AALIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
@@ -185,8 +202,8 @@ xineplug_vo_out_stk_la_LIBADD = $(XINE_LIB) $(LIBSTK_LIBS) $(PTHREAD_LIBS)
 xineplug_vo_out_stk_la_CFLAGS = $(AM_CFLAGS) $(LIBSTK_CFLAGS)
 
 xineplug_vo_out_directx_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c video_out_directx.c 
-xineplug_vo_out_directx_la_CPPFLAGS = $(DIRECTX_CPPFLAGS)
 xineplug_vo_out_directx_la_LIBADD = $(DIRECTX_VIDEO_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_vo_out_directx_la_CPPFLAGS = $(AM_CPPFLAGS) $(DIRECTX_CPPFLAGS)
 
 xineplug_vo_out_none_la_SOURCES =  video_out_none.c
 xineplug_vo_out_none_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
@@ -194,6 +211,3 @@ xineplug_vo_out_none_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
 xineplug_vo_out_macosx_la_SOURCES = video_out_macosx.m
 xineplug_vo_out_macosx_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
 xineplug_vo_out_macosx_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa -framework OpenGL
-
-noinst_HEADERS = deinterlace.h video_out_syncfb.h \
-	yuv2rgb.h x11osd.h xcbosd.h
diff --git a/src/video_out/libdha/Makefile.am b/src/video_out/libdha/Makefile.am
index 553907fc9..de63444c0 100644
--- a/src/video_out/libdha/Makefile.am
+++ b/src/video_out/libdha/Makefile.am
@@ -1,19 +1,23 @@
 include $(top_srcdir)/misc/Makefile.common
 
-EXTRA_DIST = README pci_db2c.awk
+SUBDIRS = bin oth sysdep
 
-SUBDIRS = bin kernelhelper oth sysdep
+if BUILD_DHA_KMOD
+SUBDIRS += kernelhelper
+endif
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(STATIC)
+AM_CFLAGS = $(DEFAULT_OCFLAGS)
 
-if HAVE_VIDIX
-dha_lib = libdha.la
-endif
+EXTRA_DIST = README pci_db2c.awk
 
 awk_generated = pci_dev_ids.c pci_ids.h pci_names.c pci_names.h pci_vendors.h
 CLEANFILES = $(awk_generated)
 
-noinst_LTLIBRARIES = $(dha_lib)
+noinst_HEADERS = AsmMacros.h libdha.h pci_ids.h pci_names.h pci_vendors.h
+
+if HAVE_VIDIX
+noinst_LTLIBRARIES = libdha.la
+endif
 
 libdha_la_SOURCES = libdha.c mtrr.c pci.c mmi.c ports.c irq.c cpu_flush.c
 nodist_libdha_la_SOURCES = pci_names.c 
@@ -23,8 +27,6 @@ EXTRA_PROGRAMS = test
 test_SOURCES = test.c
 test_LDADD = $(top_builddir)/src/video_out/libdha/libdha.la
 
-noinst_HEADERS = AsmMacros.h libdha.h pci_ids.h pci_names.h pci_vendors.h
-
 ## for OpenBSD LIBS += -li386
 
 ## We have to create some files, on the fly, this is why this rule is needed.
@@ -33,7 +35,7 @@ oth/pci.db:
 
 $(awk_generated): pci_db2c.awk oth/pci.db
 	LC_ALL=C $(AWK) -f $(top_srcdir)/src/video_out/libdha/pci_db2c.awk \
-	  $(top_srcdir)/src/video_out/libdha/oth/pci.db
+		$(top_srcdir)/src/video_out/libdha/oth/pci.db
 
 pci_names.lo: $(awk_generated)
 	source='$*.c' object='$@' libtool=yes \
diff --git a/src/video_out/libdha/kernelhelper/Makefile.am b/src/video_out/libdha/kernelhelper/Makefile.am
index 82a37eae3..fffaab433 100644
--- a/src/video_out/libdha/kernelhelper/Makefile.am
+++ b/src/video_out/libdha/kernelhelper/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/misc/Makefile.common
 
 EXTRA_DIST = README dhahelper.c
 
-KCFLAGS = -O2 -Wall -D__KERNEL__ -DMODULE -include `echo @LINUX_INCLUDE@ | sed -e 's/\-I//g'`/linux/modversions.h
+KCFLAGS = -O2 -Wall -D__KERNEL__ -DMODULE -include `echo $(LINUX_INCLUDE) | sed -e 's/\-I//g'`/linux/modversions.h
 
 KVERSION = $(shell $(SHELL) -c 'uname -r')
 moddir = /lib/modules/$(KVERSION)/misc
@@ -10,10 +10,8 @@ moddir = /lib/modules/$(KVERSION)/misc
 KCOMPILE = $(CC) $(CFLAGS) $(KCFLAGS) $(INCLUDES) $(LINUX_INCLUDE)
 
 if HAVE_LINUX
-if BUILD_DHA_KMOD
 KERNEL_MODULE = dhahelper.o
 endif
-endif
 
 noinst_HEADERS = dhahelper.h
 
@@ -29,25 +27,24 @@ nodes:
 all: $(KERNEL_MODULE)
 
 install-exec-local: $(KERNEL_MODULE)
-@BUILD_DHA_KMOD_TRUE@	@$(NORMAL_INSTALL)
-@BUILD_DHA_KMOD_TRUE@	$(mkinstalldirs) $(DESTDIR)$(moddir)
-@BUILD_DHA_KMOD_TRUE@	@list='$(KERNEL_MODULE)'; \
-@BUILD_DHA_KMOD_TRUE@	for p in $$list; do \
-@BUILD_DHA_KMOD_TRUE@	  if test -f $$p; then \
-@BUILD_DHA_KMOD_TRUE@	    echo "$(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p"; \
-@BUILD_DHA_KMOD_TRUE@	    $(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p; \
-@BUILD_DHA_KMOD_TRUE@	  else :; fi; \
-@BUILD_DHA_KMOD_TRUE@	done; \
-@BUILD_DHA_KMOD_TRUE@	$(DEPMOD) -a
-@BUILD_DHA_KMOD_TRUE@	if test ! -c /dev/dhahelper; then \
-@BUILD_DHA_KMOD_TRUE@	  $(MAKE) nodes; \
-@BUILD_DHA_KMOD_TRUE@	fi
-
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(moddir)
+	@list='$(KERNEL_MODULE)'; \
+	for p in $$list; do \
+	  if test -f $$p; then \
+	    echo "$(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p"; \
+	    $(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p; \
+	  else :; fi; \
+	done; \
+	$(DEPMOD) -a
+	if test ! -c /dev/dhahelper; then \
+	  $(MAKE) nodes; \
+	fi
 
 uninstall-local:
-@BUILD_DHA_KMOD_TRUE@	@$(NORMAL_UNINSTALL)
-@BUILD_DHA_KMOD_TRUE@	@list='$(KERNEL_MODULE)'; \
-@BUILD_DHA_KMOD_TRUE@	for p in $$list; do \
-@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
+	@$(NORMAL_UNINSTALL)
+	@list='$(KERNEL_MODULE)'; \
+	for p in $$list; do \
+	  echo "rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	  rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	done
diff --git a/src/video_out/macosx/Makefile.am b/src/video_out/macosx/Makefile.am
index d649dfe1d..ae6a5acc8 100644
--- a/src/video_out/macosx/Makefile.am
+++ b/src/video_out/macosx/Makefile.am
@@ -1,23 +1,12 @@
 include $(top_srcdir)/misc/Makefile.common
 
+AM_CFLAGS    = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 
-EXTRA_DIST = \
-             video_window.h \
-             XineOpenGLView.m \
-             XineOpenGLView.h \
-             XineVideoWindow.m \
-             XineVideoWindow.h
-
-if HAVE_MACOSX_VIDEO
+xineinclude_HEADERS = video_window.h XineOpenGLView.h XineVideoWindow.h
 
 lib_LTLIBRARIES = libxineMacOSXVideo.la
 
 libxineMacOSXVideo_la_SOURCES = XineOpenGLView.m XineVideoWindow.m
-libxineMacOSXVideo_la_LDFLAGS = -framework Cocoa -framework OpenGL \
+libxineMacOSXVideo_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa -framework OpenGL \
 				-version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE)
-
-xineinclude_HEADERS = video_window.h XineOpenGLView.h XineVideoWindow.h
-
-endif
-
diff --git a/src/video_out/vidix/Makefile.am b/src/video_out/vidix/Makefile.am
index e002c56f0..7f19e7ce8 100644
--- a/src/video_out/vidix/Makefile.am
+++ b/src/video_out/vidix/Makefile.am
@@ -1,21 +1,16 @@
 include $(top_srcdir)/misc/Makefile.common
 
-EXTRA_DIST = README vidix.txt
-
 SUBDIRS = drivers
 
-AM_CFLAGS = $(STATIC)
-AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \
-	      -I$(top_builddir)/src/video_out/libdha
+AM_CFLAGS   = $(DEFAULT_OCFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix -I$(top_builddir)/src/video_out/libdha
 
-if HAVE_VIDIX
-vidix_lib = libvidix.la
-endif
+EXTRA_DIST = README vidix.txt
 
-noinst_LTLIBRARIES = $(vidix_lib)
+noinst_HEADERS = fourcc.h vidix.h vidixlib.h
+
+noinst_LTLIBRARIES = libvidix.la
 
 libvidix_la_SOURCES = vidixlib.c
 libvidix_la_LIBADD = $(DYNAMIC_LD_LIBS) $(top_builddir)/src/video_out/libdha/libdha.la
 
-noinst_HEADERS = fourcc.h vidix.h vidixlib.h
-
diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am
index 23272e4c9..1ad68da26 100644
--- a/src/video_out/vidix/drivers/Makefile.am
+++ b/src/video_out/vidix/drivers/Makefile.am
@@ -1,15 +1,17 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS)
+AM_CFLAGS   = $(DEFAULT_OCFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \
-	-I$(top_srcdir)/src/video_out/libdha \
-	-I$(top_builddir)/src/video_out/libdha
-AM_LDFLAGS = $(xineplug_ldflags)
+              -I$(top_srcdir)/src/video_out/libdha -I$(top_builddir)/src/video_out/libdha
+AM_LDFLAGS  = $(xineplug_ldflags)
 
 EXTRA_DIST = genfb_vid.c
 
+noinst_HEADERS = mach64.h glint_regs.h pm3_regs.h radeon.h savage_regs.h \
+                 cyberblade_regs.h unichrome_regs.h sis_defs.h sis_regs.h
+
 if HAVE_VIDIX
-vidix_drivers = \
+vidix_LTLIBRARIES = \
 	mach64_vid.la \
 	mga_crtc2_vid.la \
 	mga_vid.la \
@@ -24,39 +26,33 @@ vidix_drivers = \
 	savage_vid.la 
 endif
 
-vidix_LTLIBRARIES = $(vidix_drivers)
-
-radeon_vid_la_SOURCES = radeon_vid.c
-radeon_vid_la_LIBADD = -lm
-
-rage128_vid_la_SOURCES = radeon_vid.c
-rage128_vid_la_LIBADD = -lm
-rage128_vid_la_CPPFLAGS = $(AM_CPPFLAGS) -DRAGE128
-
-pm2_vid_la_SOURCES = pm2_vid.c
-
-pm3_vid_la_SOURCES = pm3_vid.c
+cyberblade_vid_la_SOURCES = cyberblade_vid.c
 
 mach64_vid_la_SOURCES = mach64_vid.c
 
-mga_vid_la_SOURCES = mga_vid.c
-mga_vid_la_LIBADD = -lm
-
 mga_crtc2_vid_la_SOURCES = mga_vid.c
 mga_crtc2_vid_la_LIBADD = -lm
 mga_crtc2_vid_la_CPPFLAGS = $(AM_CPPFLAGS) -DCRTC2
 
-cyberblade_vid_la_SOURCES = cyberblade_vid.c
-
-unichrome_vid_la_SOURCES = unichrome_vid.c
+mga_vid_la_SOURCES = mga_vid.c
+mga_vid_la_LIBADD = -lm
 
 nvidia_vid_la_SOURCES = nvidia_vid.c
 
-sis_vid_la_SOURCES = sis_vid.c sis_bridge.c
+pm2_vid_la_SOURCES = pm2_vid.c
+
+pm3_vid_la_SOURCES = pm3_vid.c
+
+radeon_vid_la_SOURCES = radeon_vid.c
+radeon_vid_la_LIBADD = -lm
+
+rage128_vid_la_SOURCES = radeon_vid.c
+rage128_vid_la_LIBADD = -lm
+rage128_vid_la_CPPFLAGS = $(AM_CPPFLAGS) -DRAGE128
 
 savage_vid_la_SOURCES = savage_vid.c
 savage_vid_la_LIBADD = -lm
 
-noinst_HEADERS = mach64.h glint_regs.h pm3_regs.h radeon.h savage_regs.h \
-	cyberblade_regs.h unichrome_regs.h sis_defs.h sis_regs.h
+sis_vid_la_SOURCES = sis_vid.c sis_bridge.c
 
+unichrome_vid_la_SOURCES = unichrome_vid.c