* Move data/grim to data/mods/global/grim

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2404 4a71c877-e1ca-e34f-864e-861f7616d084

configure.ac

@@ -266,6 +266,8 @@ AC_CONFIG_FILES([Makefile
 		po/Makefile.in
 		icons/Makefile
 		data/Makefile
+		data/mods/Makefile
+		data/mods/global/Makefile
 		nsis/Makefile
 		win32/Makefile
 		lib/Makefile

data/Makefile.am

@@ -1,22 +1,22 @@
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS = mods
+
 BASELIST = anims audio components effects features \
 	gamedesc.lev images messages misc multiplay novideo.rpl palette.bin script \
 	sequenceaudio stats structs texpages wrf locale
 PATCHLIST = addon.lev anims components effects \
 	messages multiplay stats structs wrf
-GRIMLIST = components structs texpages wrf
 
 BASEARCHIVE=warzone.wz
 PATCHARCHIVE=mp.wz
-GRIMARCHIVE=grim.wz
 
-CLEANFILES=$(BASEARCHIVE) $(PATCHARCHIVE) $(GRIMARCHIVE)
+CLEANFILES=$(BASEARCHIVE) $(PATCHARCHIVE)
 
 # Remove this line when Automake 1.10 becomes standard
 MKDIR_P=$(mkdir_p)
 
-data: $(BASEARCHIVE) $(PATCHARCHIVE) $(GRIMARCHIVE)
+data: $(BASEARCHIVE) $(PATCHARCHIVE)
 
 $(BASEARCHIVE): $(BASELIST)
 	zip -ru0 $@ $(BASELIST) -x *svn*
@@ -26,28 +26,19 @@ $(PATCHARCHIVE): $(PATCHLIST:%=mp/%)
 	cd mp && zip -ru0 ../$@ $(PATCHLIST) -x *svn*
 	zip -T $@
 
-$(GRIMARCHIVE): $(GRIMLIST:%=grim/%)
-	cd grim && zip -ru0 ../$@ $(GRIMLIST) -x *svn*
-	zip -T $@
-
-install-data-local: $(BASEARCHIVE) $(PATCHARCHIVE) $(GRIMARCHIVE)
+install-data-local: $(BASEARCHIVE) $(PATCHARCHIVE)
 	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) $(srcdir)/$(BASEARCHIVE) $(DESTDIR)$(pkgdatadir)/$(BASEARCHIVE)
 	$(INSTALL_DATA) $(srcdir)/$(PATCHARCHIVE) $(DESTDIR)$(pkgdatadir)/$(PATCHARCHIVE)
-	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/mods/global
-	$(INSTALL_DATA) $(srcdir)/$(GRIMARCHIVE) $(DESTDIR)$(pkgdatadir)/mods/global/$(GRIMARCHIVE)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(pkgdatadir)/$(BASEARCHIVE)
 	rm -f $(DESTDIR)$(pkgdatadir)/$(PATCHARCHIVE)
-	rm -f $(DESTDIR)$(pkgdatadir)/mods/global/$(GRIMARCHIVE)
 
 installcheck:
 	[ -f $(BASEARCHIVE) ] && zip -T $(BASEARCHIVE)
 	[ -f $(PATCHARCHIVE) ] && zip -T $(PATCHARCHIVE)
-	[ -f $(GRIMARCHIVE) ] && zip -T $(GRIMARCHIVE)
 
 dist-hook: $(BASEARCHIVE) $(PATCHARCHIVE)
 	cp -fu $(BASEARCHIVE) $(DESTDIR)$(distdir)
 	cp -fu $(PATCHARCHIVE) $(DESTDIR)$(distdir)
-	cp -fu $(GRIMARCHIVE) $(DESTDIR)$(distdir)

data/Makefile.raw

@@ -1,3 +1,8 @@
+SUBDIRS=mods
+
+$(SUBDIRS):
+	$(MAKE) -f Makefile.raw -C $@ $(MAKECMDGOALS)
+
 MAKERULES=../makerules
 include $(MAKERULES)/configure.mk
 
@@ -6,15 +11,13 @@ BASELIST = anims audio components effects features \
 	script sequenceaudio stats structs texpages wrf
 PATCHLIST = addon.lev anims components effects \
 	messages multiplay stats structs wrf
-GRIMLIST = components structs texpages wrf
 
 BASEARCHIVE=warzone.wz
 PATCHARCHIVE=mp.wz
-GRIMARCHIVE=grim.wz
 
 all:
 ifdef DATA
-all: $(BASEARCHIVE) $(PATCHARCHIVE) $(GRIMARCHIVE)
+all: $(BASEARCHIVE) $(PATCHARCHIVE) $(SUBDIRS)
 endif
 
 $(BASEARCHIVE): $(BASELIST)
@@ -25,11 +28,8 @@ $(PATCHARCHIVE): $(PATCHLIST:%=mp/%)
 	cd mp && zip -ru0 ../$@ $(PATCHLIST) -x *svn*
 	zip -T $@
 
-$(GRIMARCHIVE): $(GRIMLIST:%=grim/%)
-	cd grim && zip -ru0 ../$@ $(GRIMLIST) -x *svn*
-	zip -T $@
-
-clean:
+clean: $(SUBDIRS)
 	$(RMF) $(BASEARCHIVE)
 	$(RMF) $(PATCHARCHIVE)
-	$(RMF) $(GRIMARCHIVE)
+
+.PHONY: all clean $(SUBDIRS)

data/mods/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = global

data/mods/Makefile.raw

@@ -0,0 +1,8 @@
+SUBDIRS=global
+
+all clean: $(SUBDIRS)
+
+$(SUBDIRS):
+	$(MAKE) -f Makefile.raw -C $@ $(MAKECMDGOALS)
+
+.PHONY: all clean $(SUBDIRS)

data/mods/global/Makefile.am

@@ -0,0 +1,29 @@
+## Process this file with automake to produce Makefile.in
+
+GRIMLIST = components structs texpages wrf
+
+GRIMARCHIVE=grim.wz
+
+CLEANFILES=$(GRIMARCHIVE)
+
+# Remove this line when Automake 1.10 becomes standard
+MKDIR_P=$(mkdir_p)
+
+data: $(GRIMARCHIVE)
+
+$(GRIMARCHIVE): $(GRIMLIST:%=grim/%)
+	cd grim && zip -ru0 ../$@ $(GRIMLIST) -x *svn*
+	zip -T $@
+
+install-data-local: $(GRIMARCHIVE)
+	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/mods/global
+	$(INSTALL_DATA) $(srcdir)/$(GRIMARCHIVE) $(DESTDIR)$(pkgdatadir)/mods/global/$(GRIMARCHIVE)
+
+uninstall-local:
+	rm -f $(DESTDIR)$(pkgdatadir)/mods/global/$(GRIMARCHIVE)
+
+installcheck:
+	[ -f $(GRIMARCHIVE) ] && zip -T $(GRIMARCHIVE)
+
+dist-hook: $(BASEARCHIVE) $(PATCHARCHIVE)
+	cp -fu $(GRIMARCHIVE) $(DESTDIR)$(distdir)

data/mods/global/Makefile.raw

@@ -0,0 +1,18 @@
+MAKERULES=../../../makerules
+include $(MAKERULES)/configure.mk
+
+GRIMLIST = components structs texpages wrf
+
+GRIMARCHIVE=grim.wz
+
+all:
+ifdef DATA
+all: $(GRIMARCHIVE)
+endif
+
+$(GRIMARCHIVE): $(GRIMLIST:%=grim/%)
+	cd grim && zip -ru0 ../$@ $(GRIMLIST) -x *svn*
+	zip -T $@
+
+clean:
+	$(RMF) $(GRIMARCHIVE)