revert broken build files

[chaz/yoink] / Makefile.am

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