build: Update all Makefile.am to more recent standards

2 files changed, 74 insertions, 87 deletions

diff --git a/Makefile.am b/Makefile.am
index fd7af7f..452a266 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = libwnck doc po
 
 ACLOCAL_AMFLAGS = -I m4
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libwnck-1.0.pc
 
@@ -11,8 +13,6 @@ EXTRA_DIST = \
 	libwnck-1.0.pc.in		\
 	libwnck-1.0-uninstalled.pc.in
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
-
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
 	$(srcdir)/aclocal.m4 \
diff --git a/libwnck/Makefile.am b/libwnck/Makefile.am
index 5587347..4e38a9a 100644
--- a/libwnck/Makefile.am
+++ b/libwnck/Makefile.am
@@ -1,11 +1,23 @@
-INCLUDES=@LIBWNCK_CFLAGS@ @XLIB_CFLAGS@ -DG_LOG_DOMAIN=\"Wnck\" -I$(top_srcdir) \
-	-DWNCK_I_KNOW_THIS_IS_UNSTABLE -DWNCK_LOCALEDIR=\"$(wncklocaledir)\" \
-	-DSN_API_NOT_YET_FROZEN=1 $(DISABLE_DEPRECATED_CFLAGS) $(WARN_CFLAGS)
+lib_LTLIBRARIES = libwnck-1.la
+bin_PROGRAMS =			\
+	wnckprop		\
+	wnck-urgency-monitor
+noinst_PROGRAMS =		\
+	test-pager		\
+	test-wnck		\
+	test-selector		\
+	test-tasklist
+
+AM_CPPFLAGS =					\
+	$(LIBWNCK_CFLAGS)			\
+	-I$(top_srcdir)				\
+	-DWNCK_I_KNOW_THIS_IS_UNSTABLE		\
+	-DWNCK_LOCALEDIR=\"$(wncklocaledir)\"	\
+	$(DISABLE_DEPRECATED_CFLAGS)
 
-lib_LTLIBRARIES=libwnck-1.la
+AM_CFLAGS = $(WARN_CFLAGS)
 
-libwnckincludedir=$(includedir)/libwnck-1.0/libwnck
-wnck_headers=			\
+wnck_headers =			\
 	libwnck.h		\
 	pager.h			\
 	application.h		\
@@ -18,15 +30,13 @@ wnck_headers=			\
 	window-action-menu.h	\
 	workspace.h
 
-wnck_built_installed_headers=wnck-enum-types.h
+wnck_built_installed_headers = wnck-enum-types.h
 
-libwnckinclude_HEADERS=			\
+libwnckincludedir = $(includedir)/libwnck-1.0/libwnck
+libwnckinclude_HEADERS =		\
 	$(wnck_headers)			\
 	$(wnck_built_installed_headers)
 
-wnck_built_headers = $(wnck_built_installed_headers) wnck-marshal.h
-wnck_built_cfiles = wnck-enum-types.c wnck-marshal.c
-
 # Sources that are relevant for introspection
 wnck_sources =			\
 	application.c		\
@@ -50,72 +60,56 @@ wnck_accessibility_files =			\
 	workspace-accessible-factory.c		\
 	workspace-accessible-factory.h
 
-libwnck_1_la_SOURCES= 		\
+wnck_built_headers = $(wnck_built_installed_headers) wnck-marshal.h inlinepixbufs.h
+wnck_built_cfiles = wnck-enum-types.c wnck-marshal.c
+
+libwnck_1_la_SOURCES = 		\
 	$(wnck_built_headers)	\
 	$(wnck_built_cfiles)	\
 	$(wnck_sources)		\
-	inlinepixbufs.h		\
 	private.h		\
 	xutils.c		\
 	xutils.h		\
 	$(wnck_accessibility_files)
 
-$(libwnck_1_la_OBJECTS): $(wnck_built_headers) inlinepixbufs.h
-
-wnckprop_SOURCES=		\
-	wnckprop.c
-
-wnck_urgency_monitor_SOURCES=	\
-	wnck-urgency-monitor.c
-
-test_wnck_SOURCES=		\
-	test-wnck.c
+$(libwnck_1_la_OBJECTS): $(wnck_built_headers)
 
-test_tasklist_SOURCES=		\
-	test-tasklist.c
-
-test_selector_SOURCES=		\
-	test-selector.c
-
-test_pager_SOURCES=		\
-	test-pager.c
-
-bin_PROGRAMS=			\
-	wnckprop		\
-	wnck-urgency-monitor
-
-noinst_PROGRAMS=		\
-	test-pager		\
-	test-wnck		\
-	test-selector		\
-	test-tasklist
-
-libwnck_1_la_LDFLAGS=								    \
-	-version-info $(LIBWNCK_CURRENT):$(LIBWNCK_REVISION):$(LIBWNCK_AGE) \
-	-no-undefined \
-        -export-symbols-regex "^[^_].*"
-
-libwnck_1_la_LIBADD=   \
-	@LIBWNCK_LIBS@ @XLIB_LIBS@
-
-wnckprop_LDADD=   \
-	@LIBWNCK_LIBS@ ./$(lib_LTLIBRARIES)
-
-wnck_urgency_monitor_LDADD=   \
-	@LIBWNCK_LIBS@ ./$(lib_LTLIBRARIES)
+libwnck_1_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)			\
+	$(XLIB_CFLAGS)			\
+	-DG_LOG_DOMAIN=\"Wnck\"		\
+	-DSN_API_NOT_YET_FROZEN=1
 
-test_wnck_LDADD=@LIBWNCK_LIBS@ ./$(lib_LTLIBRARIES)
-test_tasklist_LDADD=@LIBWNCK_LIBS@ ./$(lib_LTLIBRARIES)
-test_selector_LDADD=@LIBWNCK_LIBS@ ./$(lib_LTLIBRARIES)
-test_pager_LDADD=@LIBWNCK_LIBS@ ./$(lib_LTLIBRARIES)
+libwnck_1_la_LIBADD =	\
+	$(LIBWNCK_LIBS)	\
+	$(XLIB_LIBS)
+
+libwnck_1_la_LDFLAGS =								\
+	-version-info $(LIBWNCK_CURRENT):$(LIBWNCK_REVISION):$(LIBWNCK_AGE)	\
+	-no-undefined								\
+	-export-symbols-regex "^[^_].*"
+
+wnckprop_SOURCES = wnckprop.c
+wnck_urgency_monitor_SOURCES = wnck-urgency-monitor.c
+test_wnck_SOURCES = test-wnck.c
+test_tasklist_SOURCES = test-tasklist.c
+test_selector_SOURCES = test-selector.c
+test_pager_SOURCES = test-pager.c
+
+wnckprop_LDADD = $(LIBWNCK_LIBS) ./$(lib_LTLIBRARIES)
+wnck_urgency_monitor_LDADD = $(LIBWNCK_LIBS) ./$(lib_LTLIBRARIES)
+test_wnck_LDADD = $(LIBWNCK_LIBS) ./$(lib_LTLIBRARIES)
+test_tasklist_LDADD = $(LIBWNCK_LIBS) ./$(lib_LTLIBRARIES)
+test_selector_LDADD = $(LIBWNCK_LIBS) ./$(lib_LTLIBRARIES)
+test_pager_LDADD = $(LIBWNCK_LIBS) ./$(lib_LTLIBRARIES)
 
 wnck-marshal.h: wnck-marshal.list
-	$(AM_V_GEN)@GLIB_GENMARSHAL@ --prefix=_wnck_marshal $< --header > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=_wnck_marshal $< --header > $@
 
 wnck-marshal.c: wnck-marshal.list wnck-marshal.h
 	$(AM_V_GEN)echo "#include <libwnck/libwnck.h>" > $@ \
 	&& echo "#include \"wnck-marshal.h\"" >> $@ \
-	&& @GLIB_GENMARSHAL@ --prefix=_wnck_marshal $< --body >> $@
+	&& $(GLIB_GENMARSHAL) --prefix=_wnck_marshal $< --body >> $@
 
 wnck-enum-types.h: $(wnck_headers)
 	$(AM_V_GEN)glib-mkenums \
@@ -143,51 +137,44 @@ wnck-enum-types.c: $(wnck_headers)
 		--vtail "  return type;\n}\n\n" \
 		$^ > $@
 
-IMAGES=default_icon.png stock_delete.png stock_maximize.png stock_minimize.png
-VARIABLES=default_icon_data $(srcdir)/default_icon.png 		\
+inlinepixbufs_SOURCES = default_icon.png stock_delete.png stock_maximize.png stock_minimize.png
+inlinepixbufs_pairs =						\
+	default_icon_data $(srcdir)/default_icon.png 		\
 	stock_delete_data $(srcdir)/stock_delete.png 		\
 	stock_maximize_data $(srcdir)/stock_maximize.png 	\
 	stock_minimize_data $(srcdir)/stock_minimize.png
 
-noinst_DATA = inlinepixbufs.h
-CLEANFILES =			\
-	$(noinst_DATA)		\
-	$(wnck_built_headers)	\
-	$(wnck_built_cfiles)
-
-inlinepixbufs.h: $(IMAGES)
-	$(AM_V_GEN)$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
+inlinepixbufs.h: $(inlinepixbufs_SOURCES)
+	$(AM_V_GEN)$(GDK_PIXBUF_CSOURCE) --raw --build-list $(inlinepixbufs_pairs) > $@
 
-$(OBJECTS): inlinepixbufs.h
+CLEANFILES =			\
+	$(wnck_built_cfiles)	\
+	$(wnck_built_headers)
 
-EXTRA_DIST= 			\
-	wnck-marshal.list	\
-	$(IMAGES)
+EXTRA_DIST = 				\
+	$(inlinepixbufs_SOURCES)	\
+	wnck-marshal.list
 
 # 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
 introspection_sources = $(wnck_sources) $(libwnckinclude_HEADERS)
 
-Wnck-1.0.gir: libwnck-1.la Makefile
-Wnck_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0
-Wnck_1_0_gir_CFLAGS =			\
-	@LIBWNCK_CFLAGS@ @XLIB_CFLAGS@	\
-	-I$(top_srcdir)			\
-	-DWNCK_I_KNOW_THIS_IS_UNSTABLE	\
-	-DSN_API_NOT_YET_FROZEN=1
+Wnck-1.0.gir: libwnck-1.la
+Wnck_1_0_gir_INCLUDES = GObject-2.0 GdkPixbuf-2.0 Gtk-2.0
+Wnck_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
 Wnck_1_0_gir_LIBS = libwnck-1.la
 Wnck_1_0_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += Wnck-1.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)