3 files changed, 58 insertions, 21 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index e9911576e..787c63f84 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -38,12 +38,20 @@ DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
 link_dvdnav = libdvdnav/libdvdnav.la libdvdread/libdvdread.la
 endif
 
-CFLAGS = @CFLAGS@ $(DVD_CFLAGS) 
+AM_CFLAGS = @CFLAGS@ $(DVD_CFLAGS) 
 DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(DVD_CFLAGS) 
 
-lib_LTLIBRARIES = xineplug_inp_file.la $(in_dvd) $(in_vcd) $(in_cda) \
-	xineplug_inp_stdin_fifo.la xineplug_inp_net.la \
-	xineplug_inp_rtp.la xineplug_inp_http.la xineplug_inp_mms.la
+lib_LTLIBRARIES = \
+	$(in_cda) \
+	$(in_dvd) \
+	$(in_vcd) \
+	xineplug_inp_file.la \
+	xineplug_inp_http.la \
+	xineplug_inp_mms.la \
+	xineplug_inp_net.la \
+	xineplug_inp_rtp.la \
+	xineplug_inp_stdin_fifo.la
+	
 
 xineplug_inp_file_la_SOURCES = input_file.c
 xineplug_inp_file_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
diff --git a/src/input/libdvdnav/Makefile.am b/src/input/libdvdnav/Makefile.am
index 4c0d5c229..e15771a77 100644
--- a/src/input/libdvdnav/Makefile.am
+++ b/src/input/libdvdnav/Makefile.am
@@ -1,18 +1,32 @@
 DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
   -I$(top_srcdir)/src/input/libdvdread/
 
-CFLAGS = @CFLAGS@ $(DVD_CFLAGS) 
+AM_CFLAGS = @CFLAGS@ $(DVD_CFLAGS) 
 
 noinst_LTLIBRARIES = libdvdnav.la
 
-libdvdnav_la_SOURCES = decoder.c dvdnav.c vm.c vmcmd.c \
-		       read_cache.c navigation.c highlight.c \
-		       searching.c settings.c
-libdvdnav_la_LDFLAGS = $(THREAD_LIBS) \
-	-avoid-version -module
-
-noinst_HEADERS = decoder.h dvdnav.h dvdnav_events.h \
-	dvdnav_internal.h vm.h vmcmd.h read_cache.h dvd_types.h
+libdvdnav_la_SOURCES = \
+	decoder.c \
+	dvdnav.c \
+	highlight.c \
+	navigation.c \
+	read_cache.c \
+	searching.c \
+	settings.c \
+	vm.c \
+	vmcmd.c 
+
+libdvdnav_la_LDFLAGS = $(THREAD_LIBS) -avoid-version -module
+
+noinst_HEADERS = \
+	decoder.h \
+	dvdnav.h \
+	dvdnav_events.h \
+	dvdnav_internal.h \
+	vm.h \
+	vmcmd.h \
+	read_cache.h \
+	dvd_types.h
 
 debug:
 	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(DVD_CFLAGS)"
diff --git a/src/input/libdvdread/Makefile.am b/src/input/libdvdread/Makefile.am
index 1af16b768..590cf8030 100644
--- a/src/input/libdvdread/Makefile.am
+++ b/src/input/libdvdread/Makefile.am
@@ -1,16 +1,31 @@
 DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE 
 
-CFLAGS = @CFLAGS@ $(DVD_CFLAGS) 
+AM_CFLAGS = @CFLAGS@ $(DVD_CFLAGS) 
 
 noinst_LTLIBRARIES = libdvdread.la
 
-libdvdread_la_SOURCES = dvd_input.c dvd_reader.c dvd_udf.c ifo_read.c \
-        ifo_print.c nav_read.c nav_print.c bswap.h dvd_udf.h dvd_input.h
-libdvdread_la_LDFLAGS = $(THREAD_LIBS) \
-	-avoid-version -module
-
-noinst_HEADERS = dvd_reader.h ifo_types.h ifo_read.h \
-        ifo_print.h nav_types.h nav_read.h nav_print.h
+libdvdread_la_SOURCES = \
+	dvd_input.c \
+	dvd_reader.c \
+	dvd_udf.c \
+	ifo_read.c \
+        ifo_print.c \
+	nav_read.c \
+	nav_print.c
+
+libdvdread_la_LDFLAGS = $(THREAD_LIBS) -avoid-version -module
+
+noinst_HEADERS = \
+	bswap.h \
+	dvd_udf.h \
+	dvd_input.h \
+	dvd_reader.h \
+	ifo_types.h \
+	ifo_read.h \
+        ifo_print.h \
+	nav_types.h \
+	nav_read.h \
+	nav_print.h
 
 debug:
 	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)"