[gtkglext] Remove --disable-rebuilds configure option.



commit 8b017237defef76cfc11173f9befd64f6eefe8a3
Author: Braden McDaniel <braden endoframe com>
Date:   Sun May 29 03:15:43 2011 -0400

    Remove --disable-rebuilds configure option.

 configure.ac    |   16 ----------------
 gdk/Makefile.am |   21 +++++++++------------
 2 files changed, 9 insertions(+), 28 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 69500e7..908a033 100644
--- a/configure.ac
+++ b/configure.ac
@@ -303,22 +303,6 @@ AC_CHECK_FUNCS([memset sqrt strchr strrchr strstr])
 
 LIBS="$save_LIBS"
 
-# define a MAINT-like variable REBUILD which is set if Perl
-# and awk are found, so autogenerated sources can be rebuilt
-
-AC_ARG_ENABLE([rebuilds],
-              [AS_HELP_STRING([--disable-rebuilds],
-                              [disable all source autogeneration rules])], ,
-              [enable_rebuilds=yes])
-
-REBUILD=\#
-if test "x$enable_rebuilds" = "xyes" && \
-     test -n "$PERL" && \
-     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
-  REBUILD=
-fi
-AC_SUBST([REBUILD])
-
 case $gdktarget in
   x11|quartz|win32) ;;
   *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz or win32.]);;
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index c63953e..108387f 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -129,7 +129,6 @@ libgdkglext_win32_ API_MJ@_ API_MI@_la_LIBADD = win32/libgdkglext-win32.la $(com
 libgdkglext_win32_ API_MJ@_ API_MI@_la_DEPENDENCIES = $(gdkglext_def)
 
 BUILT_SOURCES = \
-	@REBUILD@			\
 	$(gdkglext_built_sources)
 
 DISTCLEANFILES = $(stamp_files) $(gdkglext_configure_generated_public_h_source)
@@ -140,19 +139,17 @@ MAINTAINERCLEANFILES = \
 # Generate built header without using automake BUILT_SOURCES
 $(libgdkglext_x11_ API_MJ@_ API_MI@_la_OBJECTS) $(libgdkglext_quartz_ API_MJ@_ API_MI@_la_OBJECTS) $(libgdkglext_win32_ API_MJ@_ API_MI@_la_OBJECTS): $(gdkglext_built_public_h_sources)
 
-$(srcdir)/gdkglenumtypes.h: stamp-gdkglenumtypes-h
-	@true
-stamp-gdkglenumtypes-h: @REBUILD@ $(gdkglext_public_h_sources) Makefile
+$(srcdir)/gdkglenumtypes.h: $(srcdir)/gtkglenumtypes.h.template $(gdkglext_public_h_sources) $(abs_builddir)/$(gdkglext_configure_generated_public_h_source)
 	( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkglenumtypes.h.template \
-		$(gdkglext_public_h_sources) $(abs_builddir)/$(gdkglext_configure_generated_public_h_source) ) >> xgen-geth \
-	&& (cmp -s xgen-geth $(srcdir)/gdkglenumtypes.h || cp xgen-geth $(srcdir)/gdkglenumtypes.h ) \
-	&& rm -f xgen-geth \
-	&& echo timestamp > $(@F)
-$(srcdir)/gdkglenumtypes.c: @REBUILD@ $(gdkglext_public_h_sources) Makefile
+$(gdkglext_public_h_sources) $(abs_builddir)/$(gdkglext_configure_generated_public_h_source) ) >> xgen-geth \
+&& (cmp -s xgen-geth $(srcdir)/gdkglenumtypes.h || cp xgen-geth $(srcdir)/gdkglenumtypes.h ) \
+&& rm -f xgen-geth
+
+$(srcdir)/gdkglenumtypes.c: $(srcdir)/gtkglenumtypes.c.template $(gdkglext_public_h_sources) $(abs_builddir)/$(gdkglext_configure_generated_public_h_source)
 	( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkglenumtypes.c.template \
-		$(gdkglext_public_h_sources) $(abs_builddir)/$(gdkglext_configure_generated_public_h_source) ) > xgen-getc \
-	&& cp xgen-getc $(srcdir)/gdkglenumtypes.c  \
-	&& rm -f xgen-getc
+$(gdkglext_public_h_sources) $(abs_builddir)/$(gdkglext_configure_generated_public_h_source) ) > xgen-getc \
+&& cp xgen-getc $(srcdir)/gdkglenumtypes.c  \
+&& rm -f xgen-getc
 
 #
 # Rule to install gdkglext-config.h header file



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]