GNOME.org
 

[gnome-menus] build: Update all Makefile.am to more recent standards

commit b8874d1d36c9b7d448b4958af5b71f2fa3606984
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Sep 20 17:39:28 2010 +0200

    build: Update all Makefile.am to more recent standards

 Makefile.am                                 |   29 +++++--------
 desktop-directories/Makefile.am             |   13 +++---
 layout/Makefile.am                          |    9 +---
 libmenu/Makefile.am                         |   60 +++++++++++----------------
 python/Makefile.am                          |   21 ++++-----
 simple-editor/GMenuSimpleEditor/Makefile.am |   11 ++---
 simple-editor/Makefile.am                   |    8 ++--
 util/Makefile.am                            |   26 ++++-------
 8 files changed, 73 insertions(+), 104 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 462125e..ed208e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,28 +1,16 @@
-NULL =
+SUBDIRS = libmenu desktop-directories layout util po
 
 if HAVE_PYTHON
-PYTHON_SUBDIRS = python simple-editor
+SUBDIRS += python simple-editor
 endif
 
-ALL_SUBDIRS = 			\
-	po 			\
-	libmenu			\
-	layout			\
-	desktop-directories	\
-	util			\
-	$(NULL)
-
-SUBDIRS = $(ALL_SUBDIRS) $(PYTHON_SUBDIRS)
-DIST_SUBDIRS = $(ALL_SUBDIRS) python simple-editor
-
 ACLOCAL_AMFLAGS = -I m4
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-python
+
 EXTRA_DIST = 			\
 	HACKING			\
-	MAINTAINERS		\
-	$(NULL)
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
+	MAINTAINERS
 
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
@@ -38,6 +26,11 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/py-compile \
 	`find "$(srcdir)" -type f -name Makefile.in -print` \
 	$(srcdir)/configure \
-	$(srcdir)/m4/intltool.m4
+	$(srcdir)/m4/intltool.m4 \
+	$(srcdir)/m4/libtool.m4 \
+	$(srcdir)/m4/ltoptions.m4 \
+	$(srcdir)/m4/ltsugar.m4 \
+	$(srcdir)/m4/ltversion.m4 \
+	$(srcdir)/m4/lt~obsolete.m4
 
 -include $(top_srcdir)/git.mk
diff --git a/desktop-directories/Makefile.am b/desktop-directories/Makefile.am
index d8522c3..a05eadc 100644
--- a/desktop-directories/Makefile.am
+++ b/desktop-directories/Makefile.am
@@ -1,15 +1,13 @@
-NULL = 
-
- INTLTOOL_DIRECTORY_RULE@
 directorydir = $(datadir)/desktop-directories
+
 # Should be moved to gnome-control-center:
 directory_in_controlcenterfiles =		\
 	Hardware.directory.in			\
 	InternetAndNetwork.directory.in		\
 	LookAndFeel.directory.in		\
 	Personal.directory.in			\
-	System.directory.in			\
-	$(NULL)
+	System.directory.in
+
 directory_in_files =				\
 	AudioVideo.directory.in			\
 	Development.directory.in		\
@@ -26,11 +24,12 @@ directory_in_files =				\
 	X-GNOME-Other.directory.in		\
 	X-GNOME-Menu-Applications.directory.in	\
 	X-GNOME-Menu-System.directory.in	\
-	$(directory_in_controlcenterfiles)	\
-	$(NULL)
+	$(directory_in_controlcenterfiles)
 
 directory_DATA = $(directory_in_files:.directory.in=.directory)
 
+ INTLTOOL_DIRECTORY_RULE@
+
 EXTRA_DIST= $(directory_in_files)
 
 DISTCLEANFILES = $(directory_DATA)
diff --git a/layout/Makefile.am b/layout/Makefile.am
index e52e7c3..a59c314 100644
--- a/layout/Makefile.am
+++ b/layout/Makefile.am
@@ -1,11 +1,8 @@
-NULL =
-
 menudir = $(sysconfdir)/xdg/menus
 
-menu_DATA =               		\
-	applications.menu		\
-	settings.menu			\
-	$(NULL)
+menu_DATA =			\
+	applications.menu	\
+	settings.menu
 
 EXTRA_DIST= $(menu_DATA)
 
diff --git a/libmenu/Makefile.am b/libmenu/Makefile.am
index 7ffbdfb..faf4cc5 100644
--- a/libmenu/Makefile.am
+++ b/libmenu/Makefile.am
@@ -1,14 +1,16 @@
-NULL = 
+lib_LTLIBRARIES = libgnome-menu.la
 
-INCLUDES =				\
-	-DGMENU_I_KNOW_THIS_IS_UNSTABLE	\
+AM_CPPFLAGS =				\
 	$(GLIB_CFLAGS)			\
+	-DGMENU_I_KNOW_THIS_IS_UNSTABLE	\
 	$(DISABLE_DEPRECATED_CFLAGS)	\
-	$(DEBUG_CFLAGS)			\
-	$(WARN_CFLAGS)			\
-	$(NULL)
+	$(DEBUG_CFLAGS)
 
-lib_LTLIBRARIES = libgnome-menu.la
+AM_CFLAGS = $(WARN_CFLAGS)
+
+libgnome_menu_includedir = $(includedir)/gnome-menus
+libgnome_menu_include_HEADERS =		\
+	gmenu-tree.h
 
 libgnome_menu_sources =			\
 	canonicalize.c			\
@@ -17,8 +19,7 @@ libgnome_menu_sources =			\
 	gmenu-tree.c			\
 	menu-layout.c			\
 	menu-monitor.c			\
-	menu-util.c			\
-	$(NULL)
+	menu-util.c
 
 libgnome_menu_la_SOURCES =		\
 	$(libgnome_menu_sources)	\
@@ -28,59 +29,46 @@ libgnome_menu_la_SOURCES =		\
 	gmenu-tree.h			\
 	menu-layout.h			\
 	menu-monitor.h			\
-	menu-util.h			\
-	$(NULL)
+	menu-util.h
 
 libgnome_menu_la_LIBADD = 		\
-	$(GLIB_LIBS)			\
-	$(MONITOR_LIBS)			\
-	$(NULL)
+	$(GLIB_LIBS)
+
 libgnome_menu_la_LDFLAGS =			\
 	-version-info $(LIB_MENU_LT_VERSION)	\
 	-no-undefined				\
-	-export-symbols-regex gmenu_tree	\
-	$(NULL)
+	-export-symbols-regex gmenu_tree
 
-libgnome_menu_includedir = $(includedir)/gnome-menus
-
-libgnome_menu_include_HEADERS =		\
-	gmenu-tree.h			\
-	$(NULL)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libgnome-menu.pc
 
 EXTRA_DIST =				\
-        libgnome-menu.pc.in		\
-        libgnome-menu-uninstalled.pc.in	\
-	$(NULL)
-
-CLEANFILES =				\
-	$(NULL)
+	libgnome-menu.pc.in		\
+	libgnome-menu-uninstalled.pc.in
 
-pkgconfigdir   = $(libdir)/pkgconfig
-pkgconfig_DATA = libgnome-menu.pc
+CLEANFILES =
 
 # Introspection
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 if HAVE_INTROSPECTION
 # Note: we only include the headers here so far because there's no gtk-doc at all anyway
 introspection_sources = $(libgnome_menu_include_HEADERS)
 
-GMenu-2.0.gir: libgnome-menu.la Makefile
+GMenu-2.0.gir: libgnome-menu.la
 GMenu_2_0_gir_INCLUDES = GObject-2.0
-GMenu_2_0_gir_CFLAGS =			\
-	-DGMENU_I_KNOW_THIS_IS_UNSTABLE	\
-	$(GLIB_CFLAGS)
+GMenu_2_0_gir_CFLAGS = $(AM_CPPFLAGS)
 GMenu_2_0_gir_LIBS = libgnome-menu.la
 GMenu_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
 INTROSPECTION_GIRS += GMenu-2.0.gir
 
-girdir = $(datadir)/gir-1.0
+girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibdir = $(libdir)/girepository-1.0
+typelibdir = $(INTROSPECTION_TYPELIBDIR)
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
diff --git a/python/Makefile.am b/python/Makefile.am
index 20c52b2..fc2fc55 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,21 +1,20 @@
-NULL =
-
-INCLUDES =				\
-	-DGMENU_I_KNOW_THIS_IS_UNSTABLE	\
-	-I$(srcdir)/../libmenu		\
-	$(WARN_CFLAGS)			\
-	$(NO_STRICT_ALIASING_CFLAGS)	\
+AM_CPPFLAGS =				\
 	$(GLIB_CFLAGS)			\
 	$(PYTHON_INCLUDES)		\
+	-I$(srcdir)/../libmenu		\
+	-DGMENU_I_KNOW_THIS_IS_UNSTABLE	\
 	$(DISABLE_DEPRECATED_CFLAGS)	\
-	$(DEBUG_CFLAGS)			\
-	$(NULL)
+	$(DEBUG_CFLAGS)
+
+AM_CFLAGS =
+	$(WARN_CFLAGS)			\
+	$(NO_STRICT_ALIASING_CFLAGS)
 
 gmenudir = $(pyexecdir)
 gmenu_LTLIBRARIES = gmenu.la
 
-gmenu_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initgmenu
-gmenu_la_LIBADD  = $(GLIB_LIBS) $(PYTHON_LIBS) $(top_builddir)/libmenu/libgnome-menu.la
 gmenu_la_SOURCES = gmenu.c
+gmenu_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initgmenu
+gmenu_la_LIBADD = $(GLIB_LIBS) $(PYTHON_LIBS) $(top_builddir)/libmenu/libgnome-menu.la
 
 -include $(top_srcdir)/git.mk
diff --git a/simple-editor/GMenuSimpleEditor/Makefile.am b/simple-editor/GMenuSimpleEditor/Makefile.am
index 8d7a181..9005463 100644
--- a/simple-editor/GMenuSimpleEditor/Makefile.am
+++ b/simple-editor/GMenuSimpleEditor/Makefile.am
@@ -1,4 +1,4 @@
-appdir     = $(pyexecdir)/GMenuSimpleEditor
+appdir = $(pyexecdir)/GMenuSimpleEditor
 app_PYTHON = 			\
 	__init__.py		\
 	main.py			\
@@ -8,11 +8,6 @@ app_PYTHON = 			\
 
 nodist_app_PYTHON = config.py
 
-CLEANFILES = config.py
-EXTRA_DIST = config.py.in
-
-all-local: config.py
-
 config.py: config.py.in
 	$(AM_V_GEN)sed								\
 		-e s!\ DATADIR\@!$(datadir)!				\
@@ -21,4 +16,8 @@ config.py: config.py.in
 		-e s!\ PACKAGE_VERSION\@!$(PACKAGE_VERSION)!		\
 		< $< > $@
 
+EXTRA_DIST = config.py.in
+
+CLEANFILES = config.py
+
 -include $(top_srcdir)/git.mk
diff --git a/simple-editor/Makefile.am b/simple-editor/Makefile.am
index 44b060b..1db0b60 100644
--- a/simple-editor/Makefile.am
+++ b/simple-editor/Makefile.am
@@ -6,7 +6,7 @@ gmenu-simple-editor: gmenu-simple-editor.in
 	$(AM_V_GEN)sed -e s!\ pyexecdir\@! pyexecdir@! -e s!\ PYTHON\@! PYTHON@! < $< > $@ && \
 	chmod a+x $@
 
-uidir   = $(pkgdatadir)/ui
+uidir = $(pkgdatadir)/ui
 ui_DATA = gmenu-simple-editor.ui
 
 desktopdir = $(datadir)/applications
@@ -17,11 +17,11 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 EXTRA_DIST =				\
 	gmenu-simple-editor.in		\
-	gmenu-simple-editor.desktop.in	\
-	gmenu-simple-editor.ui
+	$(desktop_in_files)		\
+	$(ui_DATA)
 
 CLEANFILES =				\
 	gmenu-simple-editor		\
-	gmenu-simple-editor.desktop
+	$(desktop_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/util/Makefile.am b/util/Makefile.am
index 38044af..d76a9db 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,33 +1,27 @@
-NULL =
+noinst_PROGRAMS = gnome-menu-spec-test
 
-INCLUDES =							\
+AM_CPPFLAGS =							\
+	$(GLIB_CFLAGS)						\
+	-I$(srcdir)/../libmenu					\
 	-DGMENU_I_KNOW_THIS_IS_UNSTABLE				\
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
-	-I$(srcdir)/../libmenu					\
-	$(GLIB_CFLAGS)						\
 	$(DISABLE_DEPRECATED_CFLAGS)				\
-	$(DEBUG_CFLAGS)						\
-	$(WARN_CFLAGS)						\
-	$(NULL)
+	$(DEBUG_CFLAGS)
 
-noinst_PROGRAMS =			\
-	gnome-menu-spec-test		\
-	$(NULL)
+AM_CFLAGS = $(WARN_CFLAGS)
 
 gnome_menu_spec_test_SOURCES =		\
-	test-menu-spec.c		\
-	$(NULL)
+	test-menu-spec.c
 
 gnome_menu_spec_test_LDADD =		\
-	../libmenu/libgnome-menu.la	\
 	$(GLIB_LIBS)			\
-	$(NULL)
+	../libmenu/libgnome-menu.la
 
 if HAVE_PYTHON
-pyexampledir   = $(pkgdatadir)/examples
+pyexampledir = $(pkgdatadir)/examples
 pyexample_DATA = gnome-menus-ls.py
 else
-pyexampledir   =
+pyexampledir =
 pyexample_DATA =
 endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]