Dan Williams schrieb: > On Wed, 2008-01-02 at 05:37 +0100, Michael Biebl wrote: >> >> 3.) 03-nm-applet-make-clean-fixes.patch >> Remove autogenerated applet-marshal.[ch] on make clean. >> Required to pass "make distcheck". >> >> Please review and apply. > > All committed, thanks! > Thanks a lot. Sorry for bothering you again, but looking at 3.) a second time, it seems a cleaner solution is, to use automake's BUILT_SOURCES consistently everywhere in NM and n-m-a. Because then it's unnecessary to declare explicit build dependencies. They are generated automatically, so the _OBJECTS: $(built_sources) lines become superfluous. I also cleaned up some stray and unused BUILT_SOURCES in src/dhcp-manager/Makefile.am and src/supplicant-manager/Makefile.am Setting -fPIC in libnm-util/Makefile.am is unnecessary, too. It's automatically set for libtool libraries. Please find the attached two patches for that. Cheers, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
Index: src/Makefile.am =================================================================== --- src/Makefile.am (Revision 428) +++ src/Makefile.am (Arbeitskopie) @@ -72,12 +72,12 @@ && cp xgen-gmc applet-marshal.c \ && rm -f xgen-gmc xgen-gmc~ -applet-marshal-main.c: applet-marshal.c applet-marshal.h +BUILT_SOURCES = applet-marshal.c applet-marshal.h gladedir = $(datadir)/nm-applet glade_DATA = applet.glade keyring.png -CLEANFILES = *.bak *.gladep applet-marshal.c applet-marshal.h +CLEANFILES = $(BUILT_SOURCES) *.bak *.gladep EXTRA_DIST = \ $(glade_DATA) \
Index: src/dhcp-manager/Makefile.am =================================================================== --- src/dhcp-manager/Makefile.am (Revision 3204) +++ src/dhcp-manager/Makefile.am (Arbeitskopie) @@ -32,5 +32,3 @@ $(GTHREAD_LIBS) \ $(top_builddir)/src/marshallers/libmarshallers.la -CLEANFILES = $(BUILT_SOURCES) - Index: src/supplicant-manager/Makefile.am =================================================================== --- src/supplicant-manager/Makefile.am (Revision 3204) +++ src/supplicant-manager/Makefile.am (Arbeitskopie) @@ -31,7 +31,3 @@ $(GTHREAD_LIBS) \ $(top_builddir)/src/marshallers/libmarshallers.la -$(libsupplicant_manager_la_OBJECTS): $(BUILT_SOURCES) - -CLEANFILES = $(BUILT_SOURCES) - Index: src/vpn-manager/Makefile.am =================================================================== --- src/vpn-manager/Makefile.am (Revision 3204) +++ src/vpn-manager/Makefile.am (Arbeitskopie) @@ -38,12 +38,10 @@ dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-client --output=nm-vpn-plugin-bindings.h $(top_srcdir)/introspection/nm-vpn-plugin.xml -built_sources = \ +BUILT_SOURCES = \ nm-vpn-manager-glue.h \ nm-vpn-connection-glue.h \ nm-vpn-plugin-bindings.h -$(libvpn_manager_la_OBJECTS): $(built_sources) +CLEANFILES = $(BUILT_SOURCES) -CLEANFILES = $(built_sources) - Index: src/Makefile.am =================================================================== --- src/Makefile.am (Revision 3204) +++ src/Makefile.am (Arbeitskopie) @@ -87,17 +87,14 @@ dbus-binding-tool --prefix=nm_ip4_config --mode=glib-server --output=nm-ip4-config-glue.h $(top_srcdir)/introspection/nm-ip4-config.xml -built_sources = \ +BUILT_SOURCES = \ nm-access-point-glue.h \ nm-manager-glue.h \ nm-device-interface-glue.h \ nm-device-802-3-ethernet-glue.h \ nm-device-802-11-wireless-glue.h \ - nm-ip4-config-glue.h \ - $(NULL) + nm-ip4-config-glue.h -$(NetworkManager_OBJECTS): $(built_sources) - NetworkManager_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(GTHREAD_CFLAGS) \ @@ -162,5 +159,5 @@ $(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir) $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir) -CLEANFILES = $(built_sources) +CLEANFILES = $(BUILT_SOURCES) Index: libnm-util/Makefile.am =================================================================== --- libnm-util/Makefile.am (Revision 3204) +++ libnm-util/Makefile.am (Arbeitskopie) @@ -46,8 +46,6 @@ libnm_util_la_LDFLAGS= $(GLIB_LIBS) $(DBUS_LIBS) -libnm_util_la_CFLAGS=-fPIC - libnm_util_includedir=$(includedir)/NetworkManager pkgconfigdir = $(libdir)/pkgconfig
Attachment:
signature.asc
Description: OpenPGP digital signature