repository reorganizing

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0df126fe3de89f4329d5f6f4fe4d0ec5786e4ba6..36d5fab3c44f9f2cddca51431bbf5580ae78207b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,30 +1,33 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data src
-EXTRA_DIST = extra
+SUBDIRS = data doc src
+
+EXTRA_DIST = autogen.sh extra
+
+
+.PHONY: run debug docs portable installer
 
 if WIN32
+
+portable: all
+       $(SH) arch/win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
+               -s $(STRIP) -V $(VERSION)
+
+installer: all
+       $(SH) arch/win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
+               -s $(STRIP) -V $(VERSION) -i $(MAKENSIS)
+
 else
-       SUBDIRS += doc
-endif
 
 run: all
-       $(MAKE) -C src run
+       @cd src && $(MAKE) run
 
 debug: all
-       $(MAKE) -C src debug
+       @cd src && $(MAKE) debug
 
-
-.PHONY: docs package
+endif
 
 docs:
        $(DOXYGEN)
 
-if WIN32
-package: all
-       $(MAKE) -C win32 installer
-else
-package: dist-bzip2
-endif
-