fixed win32 installer building

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d5f603756998443f0fac80d1ac2d646b6d8bb355..75f866e877ebeae40d89a6e217985af68c0fbdfc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,30 @@
-SUBDIRS = yajl src
+
+ACLOCAL_AMFLAGS = -I m4
+
+if WIN32
+SUBDIRS = data src
+else
+SUBDIRS = data doc src
+endif
+
+EXTRA_DIST = extra
+
+run: all
+       $(MAKE) -C src run
+
+debug: all
+       $(MAKE) -C src debug
+
+
+.PHONY: docs package
+
+docs:
+       $(DOXYGEN)
+
+if WIN32
+package: all
+       $(MAKE) -C win32 installer
+else
+package: dist-bzip2
+endif
+