From 3fa2cb69656388086ca6f98ed661002a7ee1a6d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Fri, 19 Aug 2005 16:06:54 +0000
Subject: [PATCH] Clean up

---
 Makefile.am     | 16 ++++++++--------
 src/Makefile.am |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 src/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 86a8ceddd4..54beb192a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ NULL =
 #  - po should come before . because VLC.app needs the pofiles
 #  - loader should come before modules because some plugins need it
 SUBDIRS = intl loader modules po . mozilla activex share m4 doc
-DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib
+DIST_SUBDIRS = $(SUBDIRS) debian ipkg lib
 
 EXTRA_DIST = \
 	HACKING \
@@ -31,7 +31,12 @@ EXTRA_DIST = \
 	vlc.win32.nsi \
 	$(NULL)
 
-BUILT_SOURCES =
+BUILT_SOURCES = \
+	stamp-api \
+	src/misc/modules_builtin.h \
+	src/misc/version.c \
+	$(NULL)
+
 SUFFIXES = 
 
 # Tell aclocal to use -I m4. Wonder if it really works.
@@ -45,12 +50,6 @@ AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects
 # Headers
 ###############################################################################
 
-BUILT_SOURCES += \
-	stamp-api \
-	src/misc/modules_builtin.h \
-	src/misc/version.c \
-	$(NULL)
-
 pkgincludedir = $(includedir)/vlc
 
 dist_pkginclude_HEADERS = \
@@ -259,6 +258,7 @@ EXTRA_DIST += \
 	evc/errno.h \
 	evc/config.h.in \
 	evc/modules_builtin_evc.h \
+	src/misc/modules_builtin.h.in \
 	$(NULL)
 
 dist-hook:
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index fe93832b01..0000000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = misc/modules_builtin.h.in