From bbeffda08cdae580f6550012d491cc7125189908 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 9 Feb 2017 12:18:31 +0100 Subject: build: merge src/libnm-gtk/Makefile.am in toplevel Makefile.am --- src/Makefile.am | 2 +- src/libnm-gtk/Makefile.am | 101 ------------------------------------- src/libnm-gtk/examples/Makefile.am | 2 - src/libnm-gtk/tests/Makefile.am | 24 --------- 4 files changed, 1 insertion(+), 128 deletions(-) delete mode 100644 src/libnm-gtk/Makefile.am delete mode 100644 src/libnm-gtk/examples/Makefile.am delete mode 100644 src/libnm-gtk/tests/Makefile.am (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 32bf2ee0..7bf709d3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = libnm-gtk libnma connection-editor +SUBDIRS = libnma connection-editor bin_PROGRAMS = nm-applet diff --git a/src/libnm-gtk/Makefile.am b/src/libnm-gtk/Makefile.am deleted file mode 100644 index d6b95f58..00000000 --- a/src/libnm-gtk/Makefile.am +++ /dev/null @@ -1,101 +0,0 @@ -SUBDIRS = . tests examples - -libnmgtkdir = $(includedir)/libnm-gtk - -libnmgtk_HEADERS = \ - nm-wifi-dialog.h \ - nm-wireless-dialog.h \ - nm-mobile-wizard.h \ - nm-ui-utils.h \ - nm-mobile-providers.h \ - nm-vpn-password-dialog.h - -lib_LTLIBRARIES = libnm-gtk.la - -BUILT_SOURCES = \ - nm-resources.h \ - nm-resources.c - -libnm_gtk_la_SOURCES = \ - nm-wifi-dialog.c \ - nm-wireless-dialog.c \ - nm-mobile-wizard.c \ - nm-ui-utils.c \ - nm-mobile-providers.c \ - nm-vpn-password-dialog.c \ - nm-resources.h \ - nm-resources.c \ - init.c - -libnm_gtk_la_CFLAGS = \ - $(GTK_CFLAGS) \ - $(LIBNM_GLIB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ - -DICONDIR=\""$(datadir)/icons"\" \ - -DBINDIR=\""$(bindir)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DLIBEXECDIR=\""$(libexecdir)"\" \ - -DDATADIR=\""$(datadir)"\" \ - -DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \ - -DNMALOCALEDIR=\"$(datadir)/locale\" \ - "-I${top_srcdir}/shared/" \ - -I${top_srcdir}/src/utils \ - -I${top_srcdir}/src/wireless-security - -libnm_gtk_la_LIBADD = \ - $(GTK_LIBS) \ - $(LIBNM_GLIB_LIBS) \ - $(GUDEV_LIBS) \ - $(top_builddir)/src/wireless-security/libwireless-security-libnm-glib.la - -EXTRA_libnm_gtk_la_DEPENDENCIES = $(srcdir)/libnm-gtk.ver - -libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \ - -Wl,--version-script=$(srcdir)/libnm-gtk.ver - -nm-resources.h: $(srcdir)/nm.gresource.xml - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-header --internal - -nm-resources.c: $(srcdir)/nm.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/nm.gresource.xml) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-source --internal - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libnm-gtk.pc - --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = - -if HAVE_INTROSPECTION -introspection_sources = \ - $(filter-out \ - $(BUILT_SOURCES) nm-wireless-dialog.%, \ - $(libnmgtk_HEADERS) $(libnm_gtk_la_SOURCES)) - -NMGtk-1.0.gir: libnm-gtk.la -NMGtk_1_0_gir_INCLUDES = NMClient-1.0 NetworkManager-1.0 Gtk-3.0 -NMGtk_1_0_gir_EXPORT_PACKAGES = libnm-gtk -NMGtk_1_0_gir_CFLAGS = $(libnm_gtk_la_CFLAGS) -NMGtk_1_0_gir_LIBS = libnm-gtk.la -NMGtk_1_0_gir_FILES = $(introspection_sources) -NMGtk_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma -INTROSPECTION_GIRS += NMGtk-1.0.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0 -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -check-local: - $(top_srcdir)/src/libnm-gtk/check-exports.sh $(builddir)/.libs/libnm-gtk.so $(srcdir)/libnm-gtk.ver - -CLEANFILES = $(gir_DATA) $(typelib_DATA) -endif - -EXTRA_DIST = \ - libnm-gtk.pc.in \ - libnm-gtk.ver \ - check-exports.sh \ - wifi.ui \ - nm.gresource.xml diff --git a/src/libnm-gtk/examples/Makefile.am b/src/libnm-gtk/examples/Makefile.am deleted file mode 100644 index d78ecd8d..00000000 --- a/src/libnm-gtk/examples/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - -EXTRA_DIST = mobile-providers.js diff --git a/src/libnm-gtk/tests/Makefile.am b/src/libnm-gtk/tests/Makefile.am deleted file mode 100644 index 518d7991..00000000 --- a/src/libnm-gtk/tests/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ - -noinst_PROGRAMS = \ - test-mobile-providers - -test_mobile_providers_SOURCES = \ - test-mobile-providers.c - -test_mobile_providers_CPPFLAGS = \ - $(GTK_CFLAGS) \ - $(LIBNM_GLIB_CFLAGS) \ - "-I${top_srcdir}/shared/" \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/libnm-gtk \ - -DTEST_DATA_DIR=\""$(abs_top_srcdir)/src/libnm-gtk/tests"\" - -test_mobile_providers_LDADD = \ - $(top_builddir)/src/libnm-gtk/libnm-gtk.la \ - $(LIBNM_GLIB_LIBS) - -TESTS = $(noinst_PROGRAMS) - -EXTRA_DIST = \ - iso3166-test.xml \ - serviceproviders-test.xml -- cgit v1.2.1