From a366bd54f0326c5fcf4c3c96bca748109b4fe9fc Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sat, 02 Nov 2013 17:34:33 -0400 Subject: data/tilesets/local.mk: Clean up a bit. --- diff --git a/Makefile.am b/Makefile.am index 179eb46..898339e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,6 @@ CLEANFILES = EXTRA_DIST = \ autogen.sh -clean-local: clean-local-data distclean-local: distclean-local-data .xcf.png: diff --git a/data/local.mk b/data/local.mk index cf65b15..63059ec 100644 --- a/data/local.mk +++ b/data/local.mk @@ -1,5 +1,4 @@ include $(top_srcdir)/data/maps/local.mk include $(top_srcdir)/data/tilesets/local.mk -clean-local-data: clean-local-data-tilesets distclean-local-data: distclean-local-data-tilesets diff --git a/data/tilesets/local.mk b/data/tilesets/local.mk index 03cc6f9..85c4f9e 100644 --- a/data/tilesets/local.mk +++ b/data/tilesets/local.mk @@ -2,16 +2,17 @@ tilesetsdir = $(pkgdatadir)/tilesets sdlex_CPPFLAGS += -DTILESETSDIR=\"$(tilesetsdir)\" -tilesets_sources = \ +dist_tilesets_sources = \ data/tilesets/collision.xcf \ data/tilesets/mountain_landscape_19-16-8bit.xcf -tilesets_DATA = \ - data/tilesets/collision.png \ - data/tilesets/mountain_landscape_19-16-8bit.png - data/tilesets/collision.tsx +nodist_tilesets_DATA = $(dist_tilesets_sources:.xcf=.png) + +CLEANFILES += \ + $(nodist_tilesets_DATA) -EXTRA_DIST = $(tilesets_sources) +EXTRA_DIST += \ + data/tilesets/collision.tsx data/tilesets/$(am__dirstamp): @$(MKDIR_P) data/tilesets @@ -19,7 +20,5 @@ data/tilesets/$(am__dirstamp): $(tilesets_DATA): data/tilesets/$(am__dirstamp) -clean-local-data-tilesets: - -rm -f data/tilesets/*.png distclean-local-data-tilesets: -rm -f data/tilesets/$(am__dirstamp) -- cgit v0.9.1