revert broken build files

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b8f74200619110b574c312cd191ee1300a96fcc0..26ea70580bc0943eeac487045572322b7f8a91da 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,9 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data doc src extra
+SUBDIRS = data doc src
 
+EXTRA_DIST = extra
 
 run: all
        $(MAKE) -C src run
@@ -11,33 +12,15 @@ debug: all
        $(MAKE) -C src debug
 
 
-if WIN32
-
-INSTALLER_NAME = yoinksetup-$(VERSION).exe
+.PHONY: docs package
 
-.PHONY: package
-package: $(INSTALLER_NAME)
-
-$(INSTALLER_NAME): all
-       @echo "Creating win32 installer..."
-       @(sh make-win32-installer.sh $(INSTALLER_NAME) 2> installer.log 1>&2 && \
-         rm installer.log && echo "Done.") || \
-       (echo "Installer compilation failed!"; \
-        echo "Check installer.log for details."; exit 1)
+docs:
+       $(DOXYGEN)
 
+if WIN32
+package: all
+       $(MAKE) -C win32 installer
 else
-if LINUX
-
-.PHONY: package
-package: rpm
-
-rpm: dist-bzip2
-       @echo "Creating RPM package..."
-       @($(RPMBUILD) -ba --nodeps extra/yoink.spec 2> rpmbuild.log 1>&2 && \
-               rm rpmbuild.log && echo "Done.") || \
-               (echo "rpmbuild failed!"; \
-               echo "Check rpmbuild.log for details."; exit 1)
-
-endif
+package: dist-bzip2
 endif