Permalink
Browse files

* Wrap all file lists in the automake and win32 makefiles across lin…

…es such that there's only one file on each line

 * Alphabetically sort the file lists

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6144 4a71c877-e1ca-e34f-864e-861f7616d084
  • Loading branch information...
1 parent 872a436 commit 810fac209b0aabdd9e39dda254a17dc79a5a9e18 Giel van Schijndel committed Oct 13, 2008
View
@@ -1,10 +1,14 @@
SUBDIRS = build_tools win32 lib src data po doc icons pkg
-dist_doc_DATA = AUTHORS ChangeLog COPYING COPYING.README
+dist_doc_DATA = \
+ AUTHORS \
+ ChangeLog \
+ COPYING \
+ COPYING.README
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST= \
- config.rpath \
autogen.sh \
+ config.rpath \
configure.ac
View
@@ -8,11 +8,36 @@ stamp:
zip -T $@
rm -f stamp
-BASELIST = anims audio components effects features tagdefinitions \
- gamedesc.lev images messages misc multiplay script sequenceaudio \
- stats stats-sql structs texpages wrf
-PATCHLIST = addon.lev anims components effects \
- messages multiplay stats structs wrf
+BASELIST = \
+ anims \
+ audio \
+ components \
+ effects \
+ features \
+ gamedesc.lev \
+ images \
+ messages \
+ misc \
+ multiplay \
+ script \
+ sequenceaudio \
+ stats \
+ stats-sql \
+ structs \
+ tagdefinitions \
+ texpages \
+ wrf
+
+PATCHLIST = \
+ addon.lev \
+ anims \
+ components \
+ effects \
+ messages \
+ multiplay \
+ stats \
+ structs \
+ wrf
BASEARCHIVE = base.wz
PATCHARCHIVE = mp.wz
View
@@ -5,11 +5,36 @@ include $(top_srcdir)/makerules/common.mk
SUBDIRS=mods
-BASELIST=anims audio components effects features tagdefinitions gamedesc.lev \
- images messages misc multiplay script sequenceaudio stats stats-sql \
- structs texpages wrf
-PATCHLIST=addon.lev anims components effects \
- messages multiplay stats structs wrf
+BASELIST= \
+ anims \
+ audio \
+ components \
+ effects \
+ features \
+ gamedesc.lev \
+ images \
+ messages \
+ misc \
+ multiplay \
+ script \
+ sequenceaudio \
+ stats \
+ stats-sql \
+ structs \
+ tagdefinitions \
+ texpages \
+ wrf
+
+PATCHLIST= \
+ addon.lev \
+ anims \
+ components \
+ effects \
+ messages \
+ multiplay \
+ stats \
+ structs \
+ wrf
BASEARCHIVE=base.wz
PATCHARCHIVE=mp.wz
@@ -6,9 +6,21 @@ stamp:
zip -T $@
rm -f stamp
-AIVOLUTIONLIST = multiplay commands.txt
-GRIMLIST = components structs texpages wrf COPYING
-NEWST_TILESLIST = texpages COPYING readme.txt
+AIVOLUTIONLIST = \
+ commands.txt \
+ multiplay
+
+GRIMLIST = \
+ components \
+ COPYING \
+ structs \
+ texpages \
+ wrf
+
+NEWST_TILESLIST = \
+ COPYING \
+ readme.txt \
+ texpages
AIVOLUTIONARCHIVE = aivolution.wz
GRIMARCHIVE = grim.wz
@@ -3,9 +3,21 @@ top_builddir=$(top_srcdir)
include $(top_srcdir)/makerules/common.mk
-AIVOLUTIONLIST=multiplay commands.txt
-GRIMLIST=components structs texpages wrf COPYING
-NEWST_TILESLIST=texpages COPYING readme.txt
+AIVOLUTIONLIST= \
+ commands.txt \
+ multiplay
+
+GRIMLIST= \
+ components \
+ COPYING \
+ structs \
+ texpages \
+ wrf
+
+NEWST_TILESLIST= \
+ COPYING \
+ readme.txt \
+ texpages
AIVOLUTIONARCHIVE=aivolution.wz
GRIMARCHIVE=grim.wz
@@ -6,7 +6,20 @@ stamp:
zip -T $@
rm -f stamp
-NTWLIST = addon.lev audio components COPYING doc effects images messages multiplay stats structs texpages wrf
+NTWLIST = \
+ addon.lev \
+ audio \
+ components \
+ COPYING \
+ doc \
+ effects \
+ images \
+ messages \
+ multiplay \
+ stats \
+ structs \
+ texpages \
+ wrf
NTWARCHIVE = ntw.wz
@@ -3,7 +3,20 @@ top_builddir=$(top_srcdir)
include $(top_srcdir)/makerules/common.mk
-NTWLIST=addon.lev audio components COPYING doc effects images messages multiplay stats structs texpages wrf
+NTWLIST= \
+ addon.lev \
+ audio \
+ components \
+ COPYING \
+ doc \
+ effects \
+ images \
+ messages \
+ multiplay \
+ stats \
+ structs \
+ texpages \
+ wrf
NTWARCHIVE=ntw.wz
View
@@ -1,2 +1,6 @@
musicdir=$(pkgdatadir)/music
-dist_music_DATA = menu.ogg music.wpl track1.ogg track2.ogg
+dist_music_DATA = \
+ menu.ogg \
+ music.wpl \
+ track1.ogg \
+ track2.ogg
View
@@ -1,2 +1,10 @@
-nobase_dist_doc_DATA = Readme.en Readme.en.xhtml Readme.de Readme.de.xhtml styles/readme.print.css styles/readme.screen.css styles/scriptingmanual.css
+nobase_dist_doc_DATA = \
+ Readme.en \
+ Readme.en.xhtml \
+ Readme.de \
+ Readme.de.xhtml \
+ styles/readme.print.css \
+ styles/readme.screen.css \
+ styles/scriptingmanual.css
+
dist_doc_DATA = ScriptingManual.htm
View
@@ -1,4 +1,10 @@
-dist_noinst_DATA = warzone2100.ico warzone2100.uninstall.ico warzone2100.png warzone2100.splash.png warzone2100.svg warzone2100.desktop
+dist_noinst_DATA = \
+ warzone2100.desktop \
+ warzone2100.ico \
+ warzone2100.png \
+ warzone2100.splash.png \
+ warzone2100.svg \
+ warzone2100.uninstall.ico
install-data-local:
$(MKDIR_P) $(DESTDIR)$(icondir)
View
@@ -3,13 +3,23 @@ SUBDIRS = platform
%_wrap_lua.cpp: %.i
$(SWIG) $(SWIG_LUA_OPT) -o $@ $<
-BUILT_SOURCES = betawidget_wrap_lua.cpp
-CLEANFILES = betawidget_wrap_lua.cpp
+BUILT_SOURCES = \
+ betawidget_wrap_lua.cpp
+CLEANFILES = \
+ betawidget_wrap_lua.cpp
lib_LTLIBRARIES = libbetawidget.la
-libbetawidget_la_SOURCES = betawidget_wrap_lua.cpp font.c geom.c hBox.c \
- spacer.c textEntry.c vector.c widget.c window.c
+libbetawidget_la_SOURCES = \
+ betawidget_wrap_lua.cpp \
+ font.c \
+ geom.c \
+ hBox.c \
+ spacer.c \
+ textEntry.c \
+ vector.c \
+ widget.c \
+ window.c
libbetawidget_la_CPPFLAGS = $(CAIRO_SVG_CFLAGS) $(LUA_CFLAGS) -DLIB_COMPILE=1
libbetawidget_la_LDFLAGS = $(CAIRO_SVG_LIBS) $(OPENGL_LIBS)
@@ -18,18 +28,37 @@ libbetawidget_la_LIBADD = $(LUA_LIBTOOL) platform/libplatform.la libutil.la
# FIXME: As much non-API headers (i.e. headers that shouldn't be directly
# included by client code of betawidget) as possible should be moved to
# noinst_HEADERS.
-pkginclude_HEADERS = clipboard.h font.h internal-cairo.h keycode.h geom.h \
- hBox.h spacer.h textEntry.h vector.h widget.h window.h
+pkginclude_HEADERS = \
+ clipboard.h \
+ font.h \
+ internal-cairo.h \
+ keycode.h \
+ geom.h \
+ hBox.h \
+ spacer.h \
+ textEntry.h \
+ vector.h \
+ widget.h \
+ window.h
+
noinst_HEADERS =
# utf.c, GLee
noinst_LTLIBRARIES = libutil.la
-libutil_la_SOURCES = ../framework/utf.c ../ivis_opengl/GLee.c
+libutil_la_SOURCES = \
+ ../framework/utf.c \
+ ../ivis_opengl/GLee.c
+
libutil_la_CPPFLAGS = $(SDL_CFLAGS) -DLIB_COMPILE=1
-noinst_HEADERS += ../framework/types.h ../framework/utf.h ../ivis_opengl/GLee.h
+noinst_HEADERS += \
+ ../framework/types.h \
+ ../framework/utf.h \
+ ../ivis_opengl/GLee.h
noinst_PROGRAMS = tools/sdl-testapp
-tools_sdl_testapp_SOURCES = tools/sdl-testapp.c
+tools_sdl_testapp_SOURCES = \
+ tools/sdl-testapp.c
+
tools_sdl_testapp_CPPFLAGS = -I.. $(LUA_CFLAGS) $(SDL_CFLAGS)
tools_sdl_testapp_LDADD = $(OPENGL_LIBS) $(SDL_LIBS) libbetawidget.la $(LUA_LIBTOOL)
@@ -1,6 +1,9 @@
noinst_LTLIBRARIES = libplatformsdl.la
-libplatformsdl_la_SOURCES = event.c init.c time.c
+libplatformsdl_la_SOURCES = \
+ event.c \
+ init.c \
+ time.c
libplatformsdl_la_CPPFLAGS = $(SDL_CFLAGS)
libplatformsdl_la_LIBADD = $(SDL_LIBS)
@@ -16,4 +19,6 @@ libplatformsdl_la_SOURCES += clipboardX11.c
endif
endif
-noinst_HEADERS = event.h init.h
+noinst_HEADERS = \
+ event.h \
+ init.h
@@ -1,9 +1,14 @@
AM_CPPFLAGS = $(SDL_CFLAGS) $(WZ_CPPFLAGS)
AM_CFLAGS = $(WZ_CFLAGS)
noinst_LIBRARIES = libexceptionhandler.a
-noinst_HEADERS = dumpinfo.h exceptionhandler.h exchndl.h
+noinst_HEADERS = \
+ dumpinfo.h \
+ exceptionhandler.h \
+ exchndl.h
-libexceptionhandler_a_SOURCES = dumpinfo.cpp exceptionhandler.c
+libexceptionhandler_a_SOURCES = \
+ dumpinfo.cpp \
+ exceptionhandler.c
if MINGW32
libexceptionhandler_a_SOURCES += exchndl.c
@@ -3,7 +3,8 @@ top_builddir=$(top_srcdir)
include $(top_srcdir)/makerules/common.mk
-SRC=dumpinfo.cpp \
+SRC= \
+ dumpinfo.cpp \
exceptionhandler.c \
exchndl.c
Oops, something went wrong.

0 comments on commit 810fac2

Please sign in to comment.