revert broken build files

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b77b1f2b3520bc622f9a6b78d7bb13b0294d22c8..26ea70580bc0943eeac487045572322b7f8a91da 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,9 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = yajl src data doc
-
-EXTRA_DIST = yajl
+SUBDIRS = data doc src
 
+EXTRA_DIST = extra
 
 run: all
        $(MAKE) -C src run
@@ -13,8 +12,15 @@ debug: all
        $(MAKE) -C src debug
 
 
-RPMBUILD = rpmbuild
+.PHONY: docs package
+
+docs:
+       $(DOXYGEN)
 
-RPM: dist-bzip2
-       $(RPMBUILD) -ba --nodeps extra/yoink.spec 
+if WIN32
+package: all
+       $(MAKE) -C win32 installer
+else
+package: dist-bzip2
+endif