[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11979: rearrange the order of some
From: |
Rob Savoye |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11979: rearrange the order of some of the included fragments, so we can use the default values everywhere. |
Date: |
Fri, 26 Feb 2010 17:11:47 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 11979
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Fri 2010-02-26 17:11:47 -0700
message:
rearrange the order of some of the included fragments, so we can use the
default values everywhere.
modified:
Makefile.am
=== modified file 'Makefile.am'
--- a/Makefile.am 2010-02-23 17:06:43 +0000
+++ b/Makefile.am 2010-02-27 00:11:47 +0000
@@ -16,7 +16,10 @@
#
## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS = 1.6.0
+# no-portability allows us to use GNU make variable assignments
+# without automake complaining.
+AUTOMAKE_OPTIONS = 1.6.0 -Wno-portability
+
ACLOCAL_AMFLAGS = -I macros
noinst_SCRIPT = autogen.sh
@@ -104,35 +107,6 @@
CLEANFILES =
#
-# Build an RPM package
-#
-include $(srcdir)/packaging/rpm.am
-
-# Build a Debian/Ubuntu .deb GNU/Linux package
-include $(srcdir)/packaging/deb.am
-
-#
-# Build a Debian Familiar .ipk GNU/Linux package. These are always
-# cross compiled, typically for the ARM or XScale.
-#
-include $(srcdir)/packaging/ipkg.am
-
-#
-# Access Linux Platform support.
-#
-include $(srcdir)/packaging/alp.am
-
-#
-# BSD package building
-#
-include $(srcdir)/packaging/bsd.am
-
-#
-# Mozille/Firefox XPI support
-#
-include $(srcdir)/packaging/xpi.am
-
-#
# Extract info from the repository to include in the build. If
# bazar (bzr) isn't installed, just print stubs, as this is only
# used for display purposes. It's primarily used by the testsuites
@@ -161,17 +135,49 @@
echo "static const char *BRANCH_REVNO = \"$${revno}\";" >
bzrversion.h; \
echo "static const char *BRANCH_NICK = \"$${nick}\";" >> bzrversion.h;
-BRANCH_REVNO = `grep "REVNO" bzrversion.h | cut -d '"' -f 2`
-BRANCH_NICK = `grep "NICK" bzrversion.h | cut -d '"' -f 2`
+# The branch nickname and revision number must be set before including
+# the other Makefile fragments used for package building, as they use
+# these values.
+BRANCH_REVNO := $(shell grep "REVNO" bzrversion.h | cut -d '"' -f 2)
+BRANCH_NICK := $(shell grep "NICK" bzrversion.h | cut -d '"' -f 2)
+
+#
+# Binary tarball packaging
+#
+include $(srcdir)/packaging/snapshot.am
+
+#
+# Build an RPM package
+#
+include $(srcdir)/packaging/rpm.am
+
+# Build a Debian/Ubuntu .deb GNU/Linux package
+include $(srcdir)/packaging/deb.am
+
+#
+# Build a Debian Familiar .ipk GNU/Linux package. These are always
+# cross compiled, typically for the ARM or XScale.
+#
+include $(srcdir)/packaging/ipkg.am
+
+#
+# Access Linux Platform support.
+#
+include $(srcdir)/packaging/alp.am
+
+#
+# BSD package building
+#
+include $(srcdir)/packaging/bsd.am
+
+#
+# Mozille/Firefox XPI support
+#
+include $(srcdir)/packaging/xpi.am
test:
echo $(SNAPSHOT_NAME)
-#
-# Binary tarball packaging
-#
-include $(srcdir)/packaging/snapshot.am
-
mudflap:
@echo "Rebuilding with GCC Mudflap support"
$(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflapth" LDFLAGS="$(LDFLAGS)
-lmudflapth"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11979: rearrange the order of some of the included fragments, so we can use the default values everywhere.,
Rob Savoye <=