Commit 58fcc8ef authored by Dan Williams's avatar Dan Williams

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.
parent eaa8a387
......@@ -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)
......
......@@ -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
......
......@@ -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 ...
......
......@@ -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)
......@@ -3,11 +3,11 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: libnm_glib_vpn
Description: Convenience library for clients of NetworkManager
Name: libnm-glib-vpn
Description: Convenience library for NetworkManager VPN plugins
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_vpn
Libs: -L${libdir} -lnm-glib-vpn
......@@ -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
......@@ -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 *~
......
......@@ -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) \
......
......@@ -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) \
......
......@@ -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)
......
......@@ -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) \
......
......@@ -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) \
......
......@@ -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)
......
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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment