[Gnash-commit] [SCM] Gnash branch, master, updated. ad34287ded116791e343569ad3a286fcf52c95c3

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  ad34287ded116791e343569ad3a286fcf52c95c3 (commit)
      from  25d5a4bdb6f3feb9a884481b7a96a123f38b31dd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=ad34287ded116791e343569ad3a286fcf52c95c3


commit ad34287ded116791e343569ad3a286fcf52c95c3
Author: Sandro Santilli <address@hidden>
Date:   Sun Nov 7 20:53:46 2010 +0100

    Build .configline in top-level dir (where configure is run anyway)

diff --git a/Makefile.am b/Makefile.am
index 7a5aa31..957116d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,8 +127,8 @@ CLEANFILES =
 # so it'll be an improvement anyway. Bzr is amazing slow producing
 # the info, which is why we don't want to do it all the time.
 #
-CLEANFILES += revno.h
-BUILT_SOURCES = revno.h
+CLEANFILES += revno.h .configline
+BUILT_SOURCES = revno.h .configline
 revno.h: Makefile.in
        address@hidden test -d $(srcdir)/.bzr; then \
          status=`which bzr 2>&1 | grep -c " no bzr"`; \
@@ -191,6 +191,10 @@ revno.h: Makefile.in
         echo "static const char *BRANCH_REVNO  = \"$${revno}\";" > revno.h; \
         echo "static const char *BRANCH_NICK = \"$${nick}\";" >> revno.h;
 
+.configline: config.log
+       address@hidden -f .configline
+       @head config.log | grep " .*/configure " | sed -e 's:^  . .*configure 
::' > .configline
+
 #
 # Precompiled header support
 #
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 34b1208..ef83aa1 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -43,7 +43,7 @@ localedir = $(datadir)/locale
 pluginsdir = $(libdir)/gnash/plugins
 
 # noinst_LTLIBRARIES = libgnashgui.la
-BUILT_SOURCES = .configline
+BUILT_SOURCES =
 
 EXTRA_DIST = gnash.in \
        kde/klash3.moc.in \
@@ -177,7 +177,7 @@ AM_CPPFLAGS += -DPKGDATADIR="\"$(pkgdatadir)\""
 AM_CPPFLAGS += -DRENDERER_CONFIG="\"$(RENDERER_CONFIG)\""
 AM_CPPFLAGS += -DHWACCEL_CONFIG="\"$(HWACCEL_CONFIG)\""
 AM_CPPFLAGS += -DMEDIA_CONFIG="\"$(MEDIA_CONFIG)\""
-AM_CPPFLAGS += -DCONFIG_CONFIG="\"$(shell cat .configline)\""
+AM_CPPFLAGS += -DCONFIG_CONFIG="\"$(shell cat ../.configline)\""
 AM_CPPFLAGS += -DCXXFLAGS="\"$(CXXFLAGS)\"" 
 
 dist_images_DATA = images/gnash_128_96.ico images/GnashG.png
@@ -267,7 +267,7 @@ if BUILD_RISCOS_GUI
 include $(srcdir)/riscos/riscos.am
 endif
 
-CLEANFILES = klash3.moc Kde4Gui.moc Kde4Glue.moc .configline gnash
+CLEANFILES = klash3.moc Kde4Gui.moc Kde4Glue.moc gnash
 
 bundle: Info.plist aqua-gnash
        @echo " Building: $(bundle_name)" 
@@ -280,10 +280,6 @@ bundle: Info.plist aqua-gnash
        cp -f images/GnashG.icns $(bundle_name)/Contents/Resources/
 
 
-.configline: ../config.log
-       address@hidden -f .configline
-       @head ../config.log | grep " .*/configure " | sed -e 's:^  . 
.*configure ::' > .configline
-
 #noinst_PROGRAMS = guitest # klash flak
 #guitest_SOURCES = guitest.cpp #fltk.cpp #fltksup.h fltksupp.h gnash.cpp 
gtk.cpp 
 #      gtksup.h gui.cpp gui.h menu.cpp menu.h sdl.cpp sdlsup.h [21~sdlsupp.h
diff --git a/gui/fb/Makefile.am b/gui/fb/Makefile.am
index ac868a5..2858288 100644
--- a/gui/fb/Makefile.am
+++ b/gui/fb/Makefile.am
@@ -56,7 +56,7 @@ AM_CPPFLAGS += -DPKGDATADIR="\"$(pkgdatadir)\""
 AM_CPPFLAGS += -DRENDERER_CONFIG="\"$(RENDERER_CONFIG)\""
 AM_CPPFLAGS += -DHWACCEL_CONFIG="\"$(HWACCEL_CONFIG)\""
 AM_CPPFLAGS += -DMEDIA_CONFIG="\"$(MEDIA_CONFIG)\""
-AM_CPPFLAGS += -DCONFIG_CONFIG="\"$(shell cat ../.configline)\""
+AM_CPPFLAGS += -DCONFIG_CONFIG="\"$(shell cat ../../.configline)\""
 AM_CPPFLAGS += -DCXXFLAGS="\"$(CXXFLAGS)\"" 
 
 ## WARNING: make sure GLIB_LIBS appears first

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am        |    8 ++++++--
 gui/Makefile.am    |   10 +++-------
 gui/fb/Makefile.am |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Gnash