summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2013-11-02 21:18:16 (EDT)
committer P. J. McDermott <pjm@nac.net>2013-11-02 21:18:16 (EDT)
commitee9aba53fe7a5b66f5298ee7c0ab2add78a2efc3 (patch)
treee695c28b16c5ffc5372fe2ee5a81acc5ce0089d9
parenta366bd54f0326c5fcf4c3c96bca748109b4fe9fc (diff)
downloadoverworld-rpg-ee9aba53fe7a5b66f5298ee7c0ab2add78a2efc3.zip
overworld-rpg-ee9aba53fe7a5b66f5298ee7c0ab2add78a2efc3.tar.gz
overworld-rpg-ee9aba53fe7a5b66f5298ee7c0ab2add78a2efc3.tar.bz2
Fix data/tilesets/$(am__dirstamp) stuff.
-rw-r--r--Makefile.am3
-rw-r--r--data/local.mk2
-rw-r--r--data/tilesets/local.mk10
3 files changed, 6 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 898339e..b3b36ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,12 +18,11 @@ sdlex_LDADD = \
$(EXPAT_LIBS)
CLEANFILES =
+DISTCLEANFILES =
EXTRA_DIST = \
autogen.sh
-distclean-local: distclean-local-data
-
.xcf.png:
$(XCF2PNG) -f -o $@ $<
diff --git a/data/local.mk b/data/local.mk
index 63059ec..1c94750 100644
--- a/data/local.mk
+++ b/data/local.mk
@@ -1,4 +1,2 @@
include $(top_srcdir)/data/maps/local.mk
include $(top_srcdir)/data/tilesets/local.mk
-
-distclean-local-data: distclean-local-data-tilesets
diff --git a/data/tilesets/local.mk b/data/tilesets/local.mk
index 85c4f9e..a646d90 100644
--- a/data/tilesets/local.mk
+++ b/data/tilesets/local.mk
@@ -11,14 +11,14 @@ nodist_tilesets_DATA = $(dist_tilesets_sources:.xcf=.png)
CLEANFILES += \
$(nodist_tilesets_DATA)
+DISTCLEANFILES += \
+ data/tilesets/$(am__dirstamp)
+
EXTRA_DIST += \
data/tilesets/collision.tsx
+$(nodist_tilesets_DATA): data/tilesets/$(am__dirstamp)
+
data/tilesets/$(am__dirstamp):
@$(MKDIR_P) data/tilesets
@: > data/tilesets/$(am__dirstamp)
-
-$(tilesets_DATA): data/tilesets/$(am__dirstamp)
-
-distclean-local-data-tilesets:
- -rm -f data/tilesets/$(am__dirstamp)