GNOME.org
 

[gtk+] build: remove --disable-rebuilds

commit ecaf09c9185e2a364ac61865c39c506c6f0e6232
Author: Benjamin Otte <otte redhat com>
Date:   Thu May 9 18:57:34 2013 +0200

    build: remove --disable-rebuilds
    
    It's unused and was only useful when perl wasn't installed. But perl is
    a dependency of glib these days, so it's useless.

 configure.ac               |   12 ------------
 demos/gtk-demo/Makefile.am |    2 +-
 gdk/Makefile.am            |    8 ++++----
 gtk/Makefile.am            |   16 ++++++++--------
 perf/Makefile.am           |    4 ++--
 5 files changed, 15 insertions(+), 27 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index af81c83..9713015 100644
--- a/configure.ac
+++ b/configure.ac
@@ -251,10 +251,6 @@ AC_ARG_ENABLE(debug,
                               [turn on debugging @<:@default=debug_default@:>@])],,
               [enable_debug=debug_default])
 
-AC_ARG_ENABLE(rebuilds,
-              [AS_HELP_STRING([--disable-rebuilds],
-                              [disable all source autogeneration rules])],,
-              [enable_rebuilds=yes])
 AC_ARG_ENABLE(installed_tests,
               AS_HELP_STRING([--enable-installed-tests],
                              [Install test programs (default: no)]),,
@@ -547,14 +543,6 @@ AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no)
 
 AC_PATH_PROGS(PERL, perl5 perl)
 
-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)
-
 AC_CHECK_FUNCS(lstat mkstemp)
 AC_CHECK_FUNCS(localtime_r)
 
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index b2ec42e..a576483 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -86,7 +86,7 @@ gsettings_SCHEMAS = \
 
 @GSETTINGS_RULES@
 
-demos.h: @REBUILD@ $(demos) geninclude.pl
+demos.h: $(demos) geninclude.pl
         $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
 
 gtk3_demo_SOURCES =            \
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 38a39ec..af0ac94 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -315,13 +315,13 @@ BUILT_SOURCES = \
 
 gdkenumtypes.h: stamp-gdkenumtypes.h
        @true
-stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.h.template
+stamp-gdkenumtypes.h: $(gdk_public_h_sources) gdkenumtypes.h.template
        $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \
                $(gdk_public_h_sources) ) >> xgen-geth \
        && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \
        && rm -f xgen-geth \
        && echo timestamp > $(@F)
-gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.c.template
+gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template
        $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \
                $(gdk_public_h_sources) ) > xgen-getc \
        && cp xgen-getc gdkenumtypes.c  \
@@ -330,11 +330,11 @@ gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.c.template
 #
 # Marshaller generation
 #
-gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
+gdkmarshalers.h: gdkmarshalers.list
        $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --header > 
gdkmarshalers-h.tmp \
        && mv gdkmarshalers-h.tmp gdkmarshalers.h \
        || ( rm -f gdkmarshalers-h.tmp && exit 1)
-gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
+gdkmarshalers.c: gdkmarshalers.list
        $(AM_V_GEN) (echo "#include \"gdkmarshalers.h\""; \
         $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body) > gdkmarshalers-c.tmp  
  \
        && mv gdkmarshalers-c.tmp gdkmarshalers.c \
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2f1acf3..296ef00 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1147,12 +1147,12 @@ BUILT_SOURCES = $(gtk_built_sources) stamp-icons
 # ../configure will supress all autogeneration rules.
 gtkmarshalers.h: stamp-gtkmarshalers.h
        @true
-stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
+stamp-gtkmarshalers.h: gtkmarshalers.list
        $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --header 
--valist-marshallers >> xgen-gmlh \
        && (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h) \
        && rm -f xgen-gmlh \
        && echo timestamp > $(@F)
-gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
+gtkmarshalers.c: gtkmarshalers.list
        $(AM_V_GEN) (echo "#include \"gtkmarshalers.h\""; \
         $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body  --valist-marshallers) 

xgen-gmlc \

        && cp xgen-gmlc gtkmarshalers.c \
@@ -1160,13 +1160,13 @@ gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
 
 gtktypebuiltins.h: stamp-gtktypebuiltins.h
        @true
-stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) $(deprecated_h_sources) gtktypebuiltins.h.template
+stamp-gtktypebuiltins.h: $(gtk_public_h_sources) $(deprecated_h_sources) gtktypebuiltins.h.template
        $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \
                $(gtk_public_h_sources) $(deprecated_h_sources) ) > xgen-gtbh \
        && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \
        && rm -f xgen-gtbh \
        && echo timestamp > $(@F)
-gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) $(deprecated_h_sources) gtktypebuiltins.c.template
+gtktypebuiltins.c: $(gtk_public_h_sources) $(deprecated_h_sources) gtktypebuiltins.c.template
        $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \
                $(gtk_public_h_sources) $(deprecated_h_sources) ) > xgen-gtbc \
        && cp xgen-gtbc gtktypebuiltins.c  \
@@ -1181,20 +1181,20 @@ gtkresources.c: gtk.gresource.xml gtk-default.css gtk-win32.css gtk-win32-xp.css
 
 gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h
        @true
-stamp-gtkprivatetypebuiltins.h: @REBUILD@ $(gtk_private_type_h_sources) gtkprivatetypebuiltins.h.template
+stamp-gtkprivatetypebuiltins.h: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.h.template
        $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.h.template \
                $(gtk_private_type_h_sources) ) > xgen-gptbh \
        && (cmp -s xgen-gptbh gtkprivatetypebuiltins.h || cp xgen-gptbh gtkprivatetypebuiltins.h ) \
        && rm -f xgen-gptbh \
        && echo timestamp > $(@F)
-gtkprivatetypebuiltins.c: @REBUILD@ $(gtk_private_type_h_sources)  gtkprivatetypebuiltins.c.template
+gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources)  gtkprivatetypebuiltins.c.template
        $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.c.template \
                $(gtk_private_type_h_sources) ) > xgen-gptbc \
        && cp xgen-gptbc gtkprivatetypebuiltins.c  \
        && rm -f xgen-gptbc
 
 
-gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h 
$(top_srcdir)/gtk/deprecated/*.h $(top_srcdir)/gdk/*.h Makefile
+gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h 
$(top_srcdir)/gtk/deprecated/*.h $(top_srcdir)/gdk/*.h Makefile
        $(AM_V_GEN) echo '#include <gtk/gtkx.h>' > xgen-gtfsrc.c && \
          echo 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' > xgen-gtf && \
          ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
@@ -1715,7 +1715,7 @@ gtk_update_icon_cache_program = ./gtk-update-icon-cache$(EXEEXT)
 endif
 endif
 
-gtkbuiltincache.h: @REBUILD@ stamp-icons
+gtkbuiltincache.h: stamp-icons
 if !USE_EXTERNAL_ICON_CACHE
 if CROSS_COMPILING
        $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) -C native/
diff --git a/perf/Makefile.am b/perf/Makefile.am
index e76f605..9be3bb1 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -51,13 +51,13 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES) $(stamp_files)
 
 typebuiltins.h: stamp-typebuiltins.h
        @true
-stamp-typebuiltins.h: @REBUILD@ $(headers_with_enums) typebuiltins.h.template
+stamp-typebuiltins.h: $(headers_with_enums) typebuiltins.h.template
        ( cd $(srcdir) && $(GLIB_MKENUMS) --template typebuiltins.h.template \
                $(headers_with_enums) ) >> xgen-gtbh \
        && (cmp -s xgen-gtbh typebuiltins.h || cp xgen-gtbh typebuiltins.h ) \
        && rm -f xgen-gtbh \
        && echo timestamp > $(@F)
-typebuiltins.c: @REBUILD@ $(headers_with_enums) typebuiltins.c.template
+typebuiltins.c: $(headers_with_enums) typebuiltins.c.template
        ( cd $(srcdir) && $(GLIB_MKENUMS) --template typebuiltins.c.template \
                $(headers_with_enums) ) > xgen-gtbc \
        && cp xgen-gtbc typebuiltins.c  \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]