2 files changed, 32 insertions, 33 deletions
diff --git a/src/video_out/libdha/Makefile.am b/src/video_out/libdha/Makefile.am
index 8d94347d1..05aebb704 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 = @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 ENABLE_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