[Gnash-commit] /srv/bzr/gnash/trunk r12107: Rename pch/Makefile.am to pch.am in the top level, and remove the directory.

[Rob Savoye]

------------------------------------------------------------
revno: 12107
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Wed 2010-03-24 16:48:23 -0600
message:
  Rename pch/Makefile.am to pch.am in the top level, and remove the directory.
  Built the all-includes files in the top level.
  Don't build the all-includes files if it's not enabled.
  Don't try to configure pch/Makefile.am.
removed:
  pch/
renamed:
  pch/Makefile.am => pch.am
modified:
  Makefile.am
  configure.ac
  pch.am

=== modified file 'Makefile.am'
--- a/Makefile.am       2010-03-20 23:01:26 +0000
+++ b/Makefile.am       2010-03-24 22:48:23 +0000
@@ -145,6 +145,11 @@
 BRANCH_NICK   := $(shell grep "NICK" bzrversion.h | cut -d '"' -f 2)
 
 #
+# Precompiled header support
+#
+include $(srcdir)/pch.am
+
+#
 # Binary tarball packaging
 #
 include $(srcdir)/packaging/snapshot.am

=== modified file 'configure.ac'
--- a/configure.ac      2010-03-24 16:33:04 +0000
+++ b/configure.ac      2010-03-24 22:48:23 +0000
@@ -2412,7 +2412,7 @@
 
 AM_CONDITIONAL([ENABLE_PCH], [test x"$enable_pch" != x"no"])
 
-PCH_FLAGS="-I`pwd`/pch -include all-includes.h -Winvalid-pch"
+PCH_FLAGS="-include all-includes.h -Winvalid-pch"
 AC_SUBST(PCH_FLAGS)
 
 GNASH_PATH_PTHREADS
@@ -2715,7 +2715,6 @@
 cygnal/testsuite/libamf.all/Makefile
 cygnal/testsuite/libnet.all/Makefile
 cygnal/testsuite/cygnal.all/Makefile
-pch/Makefile
 )
 
 ###

=== removed directory 'pch'
=== renamed file 'pch/Makefile.am' => 'pch.am'
--- a/pch/Makefile.am   2010-03-09 16:00:50 +0000
+++ b/pch.am    2010-03-24 22:48:23 +0000
@@ -1,4 +1,25 @@
-BUILT_SOURCES = all-includes.h.gch
+# 
+#   Copyright (C) 2010 Free Software Foundation, Inc.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# 
+
+#
+# PCH is precompiled headers, which can spead up builds.
+# 
+if ENABLE_PCH
+BUILT_SOURCES += all-includes.h.gch
 
 PCHHEADERS = \
        $(top_srcdir)/libcore/asobj/Global_as.h \
@@ -60,5 +81,5 @@
          $(PCHFLAGS)  -x c++-header -c -o all-includes.h.gch all-includes.h; \
        rm all-includes.h;
 
-CLEANFILES = all-includes.h.gch
-
+CLEANFILES += all-includes.h.gch
+endif
\ No newline at end of file