bump versions to include new trunk

[mandelbrot.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 51a4f0d311887d91ea74cb4342ed76dc1e9776bb..a44d02ec0300f444065c00f6051fc850aeb7067f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,12 +14,12 @@
 # The Original Code is KaiRo-Mandelbrot.
 #
 # The Initial Developer of the Original Code is
-# Robert Kaiser.
-# Portions created by the Initial Developer are Copyright (C) 2010
+# Robert Kaiser <kairo@kairo.at>.
+# Portions created by the Initial Developer are Copyright (C) 2010-2011
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
-#  Robert Kaiser <kairo@kairo.at>
+#  Robert Kaiser <kairo@kairo.at> (original author)
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -43,19 +43,32 @@ relativesrcdir = extensions/mandelbrot
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE       = mandelbrot
+ifdef ENABLE_TESTS
+PARALLEL_DIRS += tests
+endif
 
-EXTENSION_VERSION      = 4.0b1
+MODULE                 = mandelbrot
+
+EXTENSION_VERSION      = 4.0
 
 XPI_NAME               = mandelbrot
 USE_EXTENSION_MANIFEST = 1
 NO_JAR_AUTO_REG        = 1
+NO_JS_MANIFEST         = 1
 INSTALL_EXTENSION_ID   = mandelbrot@kairo.at
 XPI_PKGNAME            = mandelbrot-$(EXTENSION_VERSION)
 
-DIST_FILES = extension/install.rdf
+DIST_FILES = \
+  install.rdf \
+  $(NULL)
+
+PREF_JS_EXPORTS = \
+  $(srcdir)/prefs.js \
+  $(NULL)
 
-PREF_JS_EXPORTS = $(srcdir)/xulapp/defaults/preferences/prefs.js
+EXTRA_COMPONENTS = \
+  aboutMandelbrot.js \
+  $(NULL)
 
 # include config.mk before using the AB_CD var
 include $(topsrcdir)/config/config.mk
@@ -66,6 +79,13 @@ DEFINES += -DAB_CD=en-US \
 
 include $(topsrcdir)/config/rules.mk
 
-export::
-       $(NSINSTALL) -D $(FINAL_TARGET)/chrome/icons/default
-       $(INSTALL) $(srcdir)/xulapp/chrome/icons/default/mandelbrotWindow* $(FINAL_TARGET)/chrome/icons/default
+ifdef MOZ_OMNIJAR
+ABS_DIST = $(call core_abspath,$(DIST)/bin)
+
+libs::
+       @echo "Packaging $(INSTALL_EXTENSION_ID).xpi"
+       if test -d "$(ABS_DIST)/extensions/$(INSTALL_EXTENSION_ID)"; then \
+       cd $(ABS_DIST)/extensions/$(INSTALL_EXTENSION_ID)/; $(ZIP) -r9mX ../$(INSTALL_EXTENSION_ID).xpi *; \
+       rm -rf $(ABS_DIST)/extensions/$(INSTALL_EXTENSION_ID); \
+       fi
+endif