GNOME.org
 

[gnome-panel] build: Modernize build system a bit

commit 04e752f52ce124fa1009cd01a76049aca66613fb
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Jun 14 15:12:05 2011 +0200

    build: Modernize build system a bit
    
    Stop using GNOME_COMMON_INIT as it is deprecated.
    Do not use AM_MAINTAINER_MODE as it is not recommended by automake
    developers.
    Use LT_PREREQ & LT_INIT for libtool checks.
    Require intltool 0.40.6 to avoid various bugs.
    Do not use AC_ISC_POSIX, AC_HEADER_STDC, AM_PROG_CC_C_O as they
    shouldn't be needed on modern systems.
    Remove checks for perl and awk, and the useless --disable-rebuilds
    configure flag.

 applets/clock/Makefile.am             |    4 ++--
 configure.ac                          |   31 +++++--------------------------
 gnome-panel/Makefile.am               |    4 ++--
 gnome-panel/libpanel-util/Makefile.am |    4 ++--
 libpanel-applet/Makefile.am           |    4 ++--
 5 files changed, 13 insertions(+), 34 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 4d042cf..5fe5a0a 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -102,7 +102,7 @@ clock-marshallers.h: clock-marshallers.list
 clock_enum_headers =					\
 	$(top_srcdir)/applets/clock/clock-utils.h
 
-clock-typebuiltins.c: @REBUILD@ $(clock_enum_headers)
+clock-typebuiltins.c: $(clock_enum_headers)
 	$(AM_V_GEN)glib-mkenums \
 			--fhead "#include <glib-object.h>\n" \
 			--fhead "#include \"clock-typebuiltins.h\"\n\n" \
@@ -118,7 +118,7 @@ clock-typebuiltins.c: @REBUILD@ $(clock_enum_headers)
 			--vtail "  return type;\n}\n\n" \
 		$(clock_enum_headers) > $@
 
-clock-typebuiltins.h: @REBUILD@ $(clock_enum_headers)
+clock-typebuiltins.h: $(clock_enum_headers)
 	$(AM_V_GEN)glib-mkenums \
 			--fhead "#ifndef __CLOCK_TYPEBUILTINS_H__\n" \
 			--fhead "#define __CLOCK_TYPEBUILTINS_H__ 1\n\n" \
diff --git a/configure.ac b/configure.ac
index 88a8bb5..6cc1c97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,6 @@ AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 tar-ustar -Wno-portability])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_CONFIG_MACRO_DIR([m4])
-GNOME_COMMON_INIT
 
 # Before making a release, the LT_VERSION string should be modified.
 # The string is of the form C:R:A.
@@ -21,24 +20,20 @@ AC_SUBST([LIBPANEL_APPLET_API_VERSION],[$LIBPANEL_APPLET_API_VERSION])
 LIB_PANEL_APPLET_LT_VERSION=0:1:0
 AC_SUBST(LIB_PANEL_APPLET_LT_VERSION)
 
-AM_MAINTAINER_MODE
 GNOME_MAINTAINER_MODE_DEFINES
 
-IT_PROG_INTLTOOL([0.40.0])
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen disable-static])
+
+IT_PROG_INTLTOOL([0.40.6])
 
-AC_ISC_POSIX
 AC_PROG_CC
-AC_STDC_HEADERS
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-#AC_PROG_SED available in 2.59b
-AM_PROG_CC_C_O
 
 AM_PATH_PYTHON
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 
-GNOME_COMPILE_WARNINGS(maximum)
+GNOME_COMPILE_WARNINGS([maximum])
 
 # Check for introspection
 GOBJECT_INTROSPECTION_CHECK([0.9.5])
@@ -293,22 +288,6 @@ case $host in
 	;;
 esac
 
-dnl Don't use AC_PROG_AWK since we need the full pathname.
-AC_PATH_PROGS(AWK, mawk gawk nawk awk, )
-AC_PATH_PROGS(PERL, perl5 perl)
-
-dnl define a MAINT-like variable REBUILD which is set if Perl
-dnl and awk are found, so autogenerated sources can be rebuilt
-AC_ARG_ENABLE(rebuilds, [  --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 && \
-     test -n "$AWK" ; then
-  REBUILD=
-fi
-AC_SUBST(REBUILD)
-
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 814c4ac..59f7e36 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -196,7 +196,7 @@ panel-marshal.c: panel-marshal.list $(GLIB_GENMARSHAL)
 	$(AM_V_GEN)echo "#include \"panel-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=panel_marshal >> $@
 
-panel-typebuiltins.c: @REBUILD@ $(panel_enum_headers)
+panel-typebuiltins.c: $(panel_enum_headers)
 	$(AM_V_GEN)glib-mkenums \
 			--fhead "#include <glib-object.h>\n" \
 			--fhead "#include \"panel-typebuiltins.h\"\n\n" \
@@ -212,7 +212,7 @@ panel-typebuiltins.c: @REBUILD@ $(panel_enum_headers)
 			--vtail "  return type;\n}\n\n" \
 		$(panel_enum_headers) > $@
 
-panel-typebuiltins.h: @REBUILD@ $(panel_enum_headers)
+panel-typebuiltins.h: $(panel_enum_headers)
 	$(AM_V_GEN)glib-mkenums \
 			--fhead "#ifndef __PANEL_TYPEBUILTINS_H__\n" \
 			--fhead "#define __PANEL_TYPEBUILTINS_H__ 1\n\n" \
diff --git a/gnome-panel/libpanel-util/Makefile.am b/gnome-panel/libpanel-util/Makefile.am
index 5590d2c..6f52c49 100644
--- a/gnome-panel/libpanel-util/Makefile.am
+++ b/gnome-panel/libpanel-util/Makefile.am
@@ -17,7 +17,7 @@ BUILT_SOURCES =			\
 	panel-util-types.c	\
 	panel-util-types.h
 
-panel-util-types.c: @REBUILD@ $(panel_util_enum_headers)
+panel-util-types.c: $(panel_util_enum_headers)
 	$(AM_V_GEN)glib-mkenums \
 			--fhead "#include <glib-object.h>\n" \
 			--fhead "#include \"panel-util-types.h\"\n\n" \
@@ -33,7 +33,7 @@ panel-util-types.c: @REBUILD@ $(panel_util_enum_headers)
 			--vtail "  return type;\n}\n\n" \
 		$(panel_util_enum_headers) > $@
 
-panel-util-types.h: @REBUILD@ $(panel_util_enum_headers)
+panel-util-types.h: $(panel_util_enum_headers)
 	$(AM_V_GEN)glib-mkenums \
 			--fhead "#ifndef __PANEL_UTIL_TYPES_H__\n" \
 			--fhead "#define __PANEL_UTIL_TYPES_H__ 1\n\n" \
diff --git a/libpanel-applet/Makefile.am b/libpanel-applet/Makefile.am
index cb607a2..5759d03 100644
--- a/libpanel-applet/Makefile.am
+++ b/libpanel-applet/Makefile.am
@@ -49,7 +49,7 @@ panel-applet-marshal.c: panel-applet-marshal.list $(GLIB_GENMARSHAL)
 
 panel_applet_enum_headers = $(top_srcdir)/libpanel-applet/panel-applet.h
 
-panel-applet-enums.c: @REBUILD@ $(panel_applet_enum_headers)
+panel-applet-enums.c: $(panel_applet_enum_headers)
 	$(AM_V_GEN)glib-mkenums \
 			--fhead "#include <glib-object.h>\n" \
 			--fhead "#include \"panel-applet-enums.h\"\n\n" \
@@ -65,7 +65,7 @@ panel-applet-enums.c: @REBUILD@ $(panel_applet_enum_headers)
 			--vtail "  return type;\n}\n\n" \
 		$(panel_applet_enum_headers) > $@
 
-panel-applet-enums.h: @REBUILD@ $(panel_applet_enum_headers)
+panel-applet-enums.h: $(panel_applet_enum_headers)
 	$(AM_V_GEN)glib-mkenums \
 			--fhead "#ifndef __PANEL_APPLET_ENUMS_H__\n" \
 			--fhead "#define __PANEL_APPLET_ENUMS_H__\n\n" \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]