From 58fcc8efe6a4724b9dc8e6718d4d2a20c7efd19f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 26 Aug 2009 13:07:35 -0500 Subject: [PATCH] libnm-glib: libnm_glib -> libnm-glib Bothered me for a long time; now that we've bumped the soname, we can rename the library too. --- callouts/Makefile.am | 2 +- configure.ac | 4 +-- docs/libnm-glib/Makefile.am | 2 +- libnm-glib/Makefile.am | 14 +++++----- libnm-glib/libnm-glib-vpn.pc.in | 13 +++++++++ ...{libnm_glib_vpn.ver => libnm-glib-vpn.ver} | 0 .../{libnm_glib.pc.in => libnm-glib.pc.in} | 6 ++--- libnm-glib/{libnm_glib.ver => libnm-glib.ver} | 0 libnm-glib/libnm_glib_vpn.pc.in | 13 --------- policy/Makefile.am | 27 ++++++++++--------- src/system-settings/Makefile.am | 2 +- system-settings/plugins/ifcfg-rh/Makefile.am | 2 +- .../plugins/ifcfg-rh/tests/Makefile.am | 2 +- .../plugins/ifcfg-suse/Makefile.am | 2 +- system-settings/plugins/keyfile/Makefile.am | 2 +- .../plugins/keyfile/tests/Makefile.am | 2 +- test/Makefile.am | 9 +++---- test/{libnm_glib_test.c => libnm-glib-test.c} | 0 18 files changed, 51 insertions(+), 51 deletions(-) create mode 100644 libnm-glib/libnm-glib-vpn.pc.in rename libnm-glib/{libnm_glib_vpn.ver => libnm-glib-vpn.ver} (100%) rename libnm-glib/{libnm_glib.pc.in => libnm-glib.pc.in} (66%) rename libnm-glib/{libnm_glib.ver => libnm-glib.ver} (100%) delete mode 100644 libnm-glib/libnm_glib_vpn.pc.in rename test/{libnm_glib_test.c => libnm-glib-test.c} (100%) diff --git a/callouts/Makefile.am b/callouts/Makefile.am index 7acb6f023..6f28f5a7b 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -54,7 +54,7 @@ nm_dispatcher_action_CPPFLAGS = \ -DLIBEXECDIR=\"$(libexecdir)\" nm_dispatcher_action_LDADD = \ - $(top_builddir)/libnm-glib/libnm_glib.la \ + $(top_builddir)/libnm-glib/libnm-glib.la \ $(top_builddir)/libnm-util/libnm-util.la \ $(DBUS_LIBS) \ $(GLIB_LIBS) diff --git a/configure.ac b/configure.ac index 7563b5f63..a1b7fbee9 100644 --- a/configure.ac +++ b/configure.ac @@ -418,8 +418,8 @@ libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-util/tests/certs/Makefile -libnm-glib/libnm_glib.pc -libnm-glib/libnm_glib_vpn.pc +libnm-glib/libnm-glib.pc +libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile callouts/Makefile tools/Makefile diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am index f01d524a1..d41700ac7 100644 --- a/docs/libnm-glib/Makefile.am +++ b/docs/libnm-glib/Makefile.am @@ -72,7 +72,7 @@ GTKDOC_CFLAGS = \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) -GTKDOC_LIBS = $(top_builddir)/libnm-glib/libnm_glib.la +GTKDOC_LIBS = $(top_builddir)/libnm-glib/libnm-glib.la # include common portion ... diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index 1ab4b6244..ddbb33a92 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -22,7 +22,7 @@ BUILT_SOURCES = \ nm-dhcp4-config-bindings.h \ nm-ip6-config-bindings.h -lib_LTLIBRARIES = libnm_glib.la libnm_glib_vpn.la +lib_LTLIBRARIES = libnm-glib.la libnm-glib-vpn.la libnm_glib_la_CFLAGS = \ $(GLIB_CFLAGS) \ @@ -104,20 +104,20 @@ libnm_glib_la_LIBADD = \ $(GCONF_LIBS) \ $(GUDEV_LIBS) -libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver \ +libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib.ver \ -version-info "2:0:0" noinst_PROGRAMS = libnm-glib-test libnm_glib_test_SOURCES = libnm-glib-test.c libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) -libnm_glib_test_LDADD = libnm_glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS) +libnm_glib_test_LDADD = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS) libnm_glib_vpn_la_SOURCES = nm-vpn-plugin.c nm-vpn-plugin-ui-interface.c libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS) -libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver \ +libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib-vpn.ver \ -version-info "0:0:0" @@ -173,11 +173,11 @@ nm-ip6-config-bindings.h: $(top_srcdir)/introspection/nm-ip6-config.xml dbus-binding-tool --prefix=nm_ip6_config --mode=glib-client --output=$@ $< pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libnm_glib.pc libnm_glib_vpn.pc +pkgconfig_DATA = libnm-glib.pc libnm-glib-vpn.pc -DISTCLEANFILES = libnm_glib.pc libnm_glib.pc +DISTCLEANFILES = libnm-glib.pc libnm-glib.pc -EXTRA_DIST = libnm_glib.pc.in libnm_glib_vpn.pc.in libnm_glib.ver libnm_glib_vpn.ver +EXTRA_DIST = libnm-glib.pc.in libnm-glib-vpn.pc.in libnm-glib.ver libnm-glib-vpn.ver CLEANFILES = \ $(BUILT_SOURCES) diff --git a/libnm-glib/libnm-glib-vpn.pc.in b/libnm-glib/libnm-glib-vpn.pc.in new file mode 100644 index 000000000..51aec6877 --- /dev/null +++ b/libnm-glib/libnm-glib-vpn.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libnm-glib-vpn +Description: Convenience library for NetworkManager VPN plugins +Version: @VERSION@ +Requires: NetworkManager >= 0.7.995 glib-2.0 dbus-glib-1 +Cflags: -I${includedir}/libnm-glib +Libs: -L${libdir} -lnm-glib-vpn + + diff --git a/libnm-glib/libnm_glib_vpn.ver b/libnm-glib/libnm-glib-vpn.ver similarity index 100% rename from libnm-glib/libnm_glib_vpn.ver rename to libnm-glib/libnm-glib-vpn.ver diff --git a/libnm-glib/libnm_glib.pc.in b/libnm-glib/libnm-glib.pc.in similarity index 66% rename from libnm-glib/libnm_glib.pc.in rename to libnm-glib/libnm-glib.pc.in index 100126408..d1b85a5d1 100644 --- a/libnm-glib/libnm_glib.pc.in +++ b/libnm-glib/libnm-glib.pc.in @@ -3,11 +3,11 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: libnm_glib +Name: libnm-glib Description: Convenience library for clients of NetworkManager Version: @VERSION@ -Requires: NetworkManager >= 0.7.0 glib-2.0 dbus-glib-1 +Requires: NetworkManager >= 0.7.995 glib-2.0 dbus-glib-1 Cflags: -I${includedir}/libnm-glib -Libs: -L${libdir} -lnm_glib +Libs: -L${libdir} -lnm-glib diff --git a/libnm-glib/libnm_glib.ver b/libnm-glib/libnm-glib.ver similarity index 100% rename from libnm-glib/libnm_glib.ver rename to libnm-glib/libnm-glib.ver diff --git a/libnm-glib/libnm_glib_vpn.pc.in b/libnm-glib/libnm_glib_vpn.pc.in deleted file mode 100644 index fd421dd8c..000000000 --- a/libnm-glib/libnm_glib_vpn.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libnm_glib_vpn -Description: Convenience library for clients of NetworkManager -Version: @VERSION@ -Requires: NetworkManager >= 0.7.0 glib-2.0 dbus-glib-1 -Cflags: -I${includedir}/libnm-glib -Libs: -L${libdir} -lnm_glib_vpn - - diff --git a/policy/Makefile.am b/policy/Makefile.am index 17fc56dc5..409e8edda 100644 --- a/policy/Makefile.am +++ b/policy/Makefile.am @@ -5,19 +5,20 @@ dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy) @INTLTOOL_POLICY_RULE@ -check: - @for f in $(dist_polkit_policy_DATA); do \ - echo -n "Validate PolicyKit policy in $$f : "; \ - $(POLKIT_POLICY_FILE_VALIDATE) $(srcdir)/$$f ; \ - ret=$$?; \ - if [ "$$ret" = "0" ]; \ - then \ - echo ok; \ - else \ - echo failed; \ - exit 1; \ - fi; \ - done; +# polkit >= 0.92 doesn't have an updated polkit-policy-file-validate +#check: +# @for f in $(dist_polkit_policy_DATA); do \ +# echo -n "Validate PolicyKit policy in $$f : "; \ +# $(POLKIT_POLICY_FILE_VALIDATE) $(srcdir)/$$f ; \ +# ret=$$?; \ +# if [ "$$ret" = "0" ]; \ +# then \ +# echo ok; \ +# else \ +# echo failed; \ +# exit 1; \ +# fi; \ +# done; clean-local : rm -f *~ diff --git a/src/system-settings/Makefile.am b/src/system-settings/Makefile.am index d71d2699a..baec81412 100644 --- a/src/system-settings/Makefile.am +++ b/src/system-settings/Makefile.am @@ -42,7 +42,7 @@ libsystem_settings_la_CPPFLAGS = \ libsystem_settings_la_LIBADD = \ $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/libnm-glib/libnm_glib.la \ + $(top_builddir)/libnm-glib/libnm-glib.la \ $(top_builddir)/marshallers/libmarshallers.la \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ diff --git a/system-settings/plugins/ifcfg-rh/Makefile.am b/system-settings/plugins/ifcfg-rh/Makefile.am index 9896bfe9b..e282421d6 100644 --- a/system-settings/plugins/ifcfg-rh/Makefile.am +++ b/system-settings/plugins/ifcfg-rh/Makefile.am @@ -53,7 +53,7 @@ libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = \ libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = -module -avoid-version libnm_settings_plugin_ifcfg_rh_la_LIBADD = \ $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/libnm-glib/libnm_glib.la \ + $(top_builddir)/libnm-glib/libnm-glib.la \ $(top_builddir)/marshallers/libmarshallers.la \ libifcfg-rh-io.la \ $(GLIB_LIBS) \ diff --git a/system-settings/plugins/ifcfg-rh/tests/Makefile.am b/system-settings/plugins/ifcfg-rh/tests/Makefile.am index 20d2d5d0d..f4eafb0d0 100644 --- a/system-settings/plugins/ifcfg-rh/tests/Makefile.am +++ b/system-settings/plugins/ifcfg-rh/tests/Makefile.am @@ -18,7 +18,7 @@ test_ifcfg_rh_CPPFLAGS = \ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" test_ifcfg_rh_LDADD = \ - $(top_builddir)/libnm-glib/libnm_glib.la \ + $(top_builddir)/libnm-glib/libnm-glib.la \ $(top_builddir)/libnm-util/libnm-util.la \ $(top_builddir)/system-settings/plugins/ifcfg-rh/libifcfg-rh-io.la \ $(DBUS_LIBS) diff --git a/system-settings/plugins/ifcfg-suse/Makefile.am b/system-settings/plugins/ifcfg-suse/Makefile.am index 67d5ad9a6..c0d5910fd 100644 --- a/system-settings/plugins/ifcfg-suse/Makefile.am +++ b/system-settings/plugins/ifcfg-suse/Makefile.am @@ -27,7 +27,7 @@ libnm_settings_plugin_ifcfg_suse_la_CPPFLAGS = \ libnm_settings_plugin_ifcfg_suse_la_LDFLAGS = -module -avoid-version libnm_settings_plugin_ifcfg_suse_la_LIBADD = \ $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/libnm-glib/libnm_glib.la \ + $(top_builddir)/libnm-glib/libnm-glib.la \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ $(POLKIT_LIBS) \ diff --git a/system-settings/plugins/keyfile/Makefile.am b/system-settings/plugins/keyfile/Makefile.am index dbf5a2541..ca4d3cd3f 100644 --- a/system-settings/plugins/keyfile/Makefile.am +++ b/system-settings/plugins/keyfile/Makefile.am @@ -28,7 +28,7 @@ libnm_settings_plugin_keyfile_la_CPPFLAGS = \ libnm_settings_plugin_keyfile_la_LDFLAGS = -module -avoid-version libnm_settings_plugin_keyfile_la_LIBADD = \ $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/libnm-glib/libnm_glib.la \ + $(top_builddir)/libnm-glib/libnm-glib.la \ $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ diff --git a/system-settings/plugins/keyfile/tests/Makefile.am b/system-settings/plugins/keyfile/tests/Makefile.am index abebbe3f3..a0af14b26 100644 --- a/system-settings/plugins/keyfile/tests/Makefile.am +++ b/system-settings/plugins/keyfile/tests/Makefile.am @@ -19,7 +19,7 @@ test_keyfile_CPPFLAGS = \ test_keyfile_LDADD = \ $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \ - $(top_builddir)/libnm-glib/libnm_glib.la \ + $(top_builddir)/libnm-glib/libnm-glib.la \ $(top_builddir)/libnm-util/libnm-util.la \ $(DBUS_LIBS) diff --git a/test/Makefile.am b/test/Makefile.am index e5f0c4784..9a07f9156 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,6 @@ INCLUDES = -I${top_srcdir} \ -I${top_srcdir}/libnm-util \ -I${top_srcdir}/libnm-glib \ - -I${top_srcdir}/gnome/libnm_glib \ -I${top_srcdir}/include AM_CPPFLAGS = \ @@ -13,11 +12,11 @@ AM_CPPFLAGS = \ bin_PROGRAMS = nm-tool -noinst_PROGRAMS = nm-online libnm_glib_test +noinst_PROGRAMS = nm-online libnm-glib-test nm_tool_SOURCES = nm-tool.c nm_tool_LDADD = \ - $(top_builddir)/libnm-glib/libnm_glib.la \ + $(top_builddir)/libnm-glib/libnm-glib.la \ $(top_builddir)/libnm-util/libnm-util.la \ $(DBUS_LIBS) \ $(GLIB_LIBS) @@ -28,9 +27,9 @@ nm_online_LDADD = \ $(DBUS_LIBS) \ $(GLIB_LIBS) -libnm_glib_test_SOURCES = libnm_glib_test.c +libnm_glib_test_SOURCES = libnm-glib-test.c libnm_glib_test_LDADD = \ - $(top_builddir)/libnm-glib/libnm_glib.la \ + $(top_builddir)/libnm-glib/libnm-glib.la \ $(top_builddir)/libnm-util/libnm-util.la \ $(DBUS_LIBS) \ $(GLIB_LIBS) diff --git a/test/libnm_glib_test.c b/test/libnm-glib-test.c similarity index 100% rename from test/libnm_glib_test.c rename to test/libnm-glib-test.c