Get rid of a few unnecessary Makefile.ams.

2010-12-11 16:41:57 +01:00 · 2010-12-11 16:41:57 +01:00 · dd4391990d
parent f378c9eb2d
commit dd4391990d
7 changed files with 22 additions and 20 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,4 +1,24 @@
-SUBDIRS = build_tools win32 lib src data po doc icons pkg tests
+SUBDIRS = \
+	  build_tools/autorevision \
+	  win32 \
+	  lib/framework \
+	  lib/exceptionhandler \
+	  lib/script \
+	  lib/sequence \
+	  lib/iniparser \
+	  lib/ivis_common \
+	  lib/ivis_opengl \
+	  lib/gamelib \
+	  lib/sound \
+	  lib/netplay \
+	  lib/widget \
+	  src \
+	  data \
+	  po \
+	  doc \
+	  icons \
+	  pkg/nsis \
+	  tests

 dist_doc_DATA = \
 	AUTHORS \
--- a/build_tools/Makefile.am
+++ b/build_tools/Makefile.am
@ -1 +0,0 @@
-SUBDIRS=autorevision
--- a/configure.ac
+++ b/configure.ac
@ -456,18 +456,14 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([Makefile
 		po/Makefile.in
 		doc/Makefile
-		build_tools/Makefile
 		build_tools/autorevision/Makefile
 		icons/Makefile
 		data/Makefile
-		data/mods/Makefile
 		data/mods/multiplay/Makefile
 		data/music/Makefile
-		pkg/Makefile
 		pkg/nsis/Makefile
 		win32/Makefile
 		tests/Makefile
-		lib/Makefile
 		lib/framework/Makefile
 		lib/exceptionhandler/Makefile
 		lib/gamelib/Makefile
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -1,4 +1,4 @@
-SUBDIRS = mods music
+SUBDIRS = mods/multiplay music

 stamp:
 	touch stamp
--- a/data/mods/Makefile.am
+++ b/data/mods/Makefile.am
@ -1 +0,0 @@
-SUBDIRS = multiplay
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@ -1,11 +0,0 @@
-SUBDIRS = framework	\
-	exceptionhandler \
-	script		\
-	sequence	\
-	iniparser	\
-	ivis_common	\
-	ivis_opengl	\
-	gamelib		\
-	sound		\
-	netplay		\
-	widget
--- a/pkg/Makefile.am
+++ b/pkg/Makefile.am
@ -1 +0,0 @@
-SUBDIRS = nsis