build: merge src/Makefile.am in toplevel Makefile.am

... and man/Makefile.am and shared/Makefile.am.

5 files changed, 114 insertions, 105 deletions

diff --git a/Makefile.am b/Makefile.am
index a585f063..053b6733 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,8 @@ DISTCLEANFILES =
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-more-warnings=yes
 
+man_MANS =
+
 pkgconfig_DATA =
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -46,10 +48,7 @@ INTROSPECTION_GIRS =
 
 SUBDIRS = \
 	. \
-	src \
-	po \
-	man \
-	shared
+	po
 
 ###############################################################################
 
@@ -511,7 +510,7 @@ EXTRA_DIST += \
 
 ###############################################################################
 
-BUILT_SOURCES = \
+BUILT_SOURCES += \
 	src/connection-editor/ce-resources.h \
 	src/connection-editor/ce-resources.c
 
@@ -651,6 +650,116 @@ EXTRA_DIST += \
 
 ###############################################################################
 
+BUILT_SOURCES += \
+	src/applet-resources.h \
+	src/applet-resources.c
+
+src/applet-resources.h: src/applet.gresource.xml
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src --generate-header --internal
+
+src/applet-resources.c: src/applet.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/src --generate-dependencies $(srcdir)/src/applet.gresource.xml)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src --generate-source --internal
+
+
+bin_PROGRAMS += src/nm-applet
+
+src_nm_applet_SOURCES = \
+	src/applet-resources.h \
+	src/applet-resources.c \
+	\
+	src/main.c \
+	src/applet.c \
+	src/applet.h \
+	src/applet-agent.c \
+	src/applet-agent.h \
+	src/applet-vpn-request.c \
+	src/applet-vpn-request.h \
+	src/ethernet-dialog.h \
+	src/ethernet-dialog.c \
+	src/applet-dialogs.h \
+	src/applet-dialogs.c \
+	src/applet-device-ethernet.h \
+	src/applet-device-ethernet.c \
+	src/applet-device-wifi.h \
+	src/applet-device-wifi.c \
+	src/ap-menu-item.h \
+	src/ap-menu-item.c \
+	src/mb-menu-item.h \
+	src/mb-menu-item.c \
+	src/mobile-helpers.c \
+	src/mobile-helpers.h \
+	src/applet-device-bt.h \
+	src/applet-device-bt.c \
+	src/fallback-icon.h
+
+if WITH_WWAN
+src_nm_applet_SOURCES += \
+	src/applet-device-broadband.h \
+	src/applet-device-broadband.c
+endif
+
+src_nm_applet_CPPFLAGS = \
+	-DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4 \
+	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4 \
+	-DICONDIR=\""$(datadir)/icons"\" \
+	-DBINDIR=\""$(bindir)"\" \
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	-DLIBEXECDIR=\""$(libexecdir)"\" \
+	-DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
+	-DNMALOCALEDIR=\"$(datadir)/locale\" \
+	-DG_LOG_DOMAIN=\""nm-applet"\" \
+	"-I$(srcdir)/shared" \
+	"-I$(srcdir)/src/utils" \
+	"-I$(srcdir)/src/wireless-security" \
+	"-I$(srcdir)/src/libnma" \
+	$(GTK_CFLAGS) \
+	$(LIBNM_CFLAGS) \
+	$(LIBSECRET_CFLAGS) \
+	$(NOTIFY_CFLAGS) \
+	$(MM_GLIB_CFLAGS) \
+	$(APPINDICATOR_CFLAGS)
+
+src_nm_applet_LDADD = \
+	src/utils/libutils-libnm.la \
+	src/wireless-security/libwireless-security-libnm.la \
+	src/libnma/libnma.la \
+	$(GTK_LIBS) \
+	$(LIBNM_LIBS) \
+	$(LIBSECRET_LIBS) \
+	$(NOTIFY_LIBS) \
+	$(MM_GLIB_LIBS) \
+	$(APPINDICATOR_LIBS) \
+	-lm
+
+
+EXTRA_DIST += \
+	src/8021x.ui \
+	src/gsm-unlock.ui \
+	src/info.ui \
+	src/applet.gresource.xml
+
+###############################################################################
+
+EXTRA_DIST += \
+	shared/nm-utils/gsystem-local-alloc.h \
+	shared/nm-utils/nm-glib.h \
+	shared/nm-utils/nm-macros-internal.h \
+	shared/nm-utils/nm-shared-utils.c \
+	shared/nm-utils/nm-shared-utils.h \
+	shared/nm-utils/nm-test-utils.h \
+	shared/nm-utils/nm-vpn-editor-plugin-call.h \
+	shared/nm-default.h \
+	shared/nm-libnm-compat.h \
+	$(NULL)
+
+###############################################################################
+
+man_MANS += \
+	man/nm-applet.1 \
+	man/nm-connection-editor.1
+
+###############################################################################
+
 check_PROGRAMS += $(check_programs)
 
 check-local: $(check_local)
diff --git a/configure.ac b/configure.ac
index 100fdc17..f3f580f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,14 +164,11 @@ AC_DEFINE_UNQUOTED(NM_MORE_ASSERTS, $more_asserts, [Define if more asserts are e
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
 src/libnm-gtk/libnm-gtk.pc
 src/libnma/libnma.pc
 po/Makefile.in
-man/Makefile
 man/nm-applet.1
 man/nm-connection-editor.1
-shared/Makefile
 org.gnome.nm-applet.gschema.xml
 ])
 AC_OUTPUT
diff --git a/man/Makefile.am b/man/Makefile.am
deleted file mode 100644
index 06ab1bb3..00000000
--- a/man/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-man_MANS = nm-applet.1 nm-connection-editor.1
-
diff --git a/shared/Makefile.am b/shared/Makefile.am
deleted file mode 100644
index 2e45201f..00000000
--- a/shared/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-EXTRA_DIST = \
-     nm-utils/gsystem-local-alloc.h \
-     nm-utils/nm-glib.h \
-     nm-utils/nm-macros-internal.h \
-     nm-utils/nm-shared-utils.c \
-     nm-utils/nm-shared-utils.h \
-     nm-utils/nm-test-utils.h \
-     nm-utils/nm-vpn-editor-plugin-call.h \
-     nm-default.h \
-     nm-libnm-compat.h \
-     $(NULL)
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index b83f3f49..00000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-bin_PROGRAMS = nm-applet
-
-nm_applet_CPPFLAGS = \
-	$(GTK_CFLAGS) \
-	$(LIBNM_CFLAGS) \
-	$(LIBSECRET_CFLAGS) \
-	$(NOTIFY_CFLAGS) \
-	$(MM_GLIB_CFLAGS) \
-	$(APPINDICATOR_CFLAGS) \
-	-DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4 \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4 \
-	-DICONDIR=\""$(datadir)/icons"\"						\
-	-DBINDIR=\""$(bindir)"\"								\
-	-DSYSCONFDIR=\""$(sysconfdir)"\"						\
-	-DLIBEXECDIR=\""$(libexecdir)"\" \
-	-DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\"			\
-	-DNMALOCALEDIR=\"$(datadir)/locale\"					\
-	-DG_LOG_DOMAIN=\""nm-applet"\" \
-	"-I${top_srcdir}/shared/" \
-	-I${top_srcdir}/src/utils \
-	-I${top_srcdir}/src/wireless-security \
-	-I${top_srcdir}/src/libnma
-
-nm_applet_SOURCES = \
-	main.c \
-	applet.c \
-	applet.h \
-	applet-agent.c \
-	applet-agent.h \
-	applet-vpn-request.c \
-	applet-vpn-request.h \
-	ethernet-dialog.h \
-	ethernet-dialog.c \
-	applet-dialogs.h \
-	applet-dialogs.c \
-	applet-device-ethernet.h \
-	applet-device-ethernet.c \
-	applet-device-wifi.h \
-	applet-device-wifi.c \
-	ap-menu-item.h \
-	ap-menu-item.c \
-	mb-menu-item.h \
-	mb-menu-item.c \
-	mobile-helpers.c \
-	mobile-helpers.h \
-	applet-device-bt.h \
-	applet-device-bt.c \
-	applet-resources.h \
-	applet-resources.c \
-	fallback-icon.h
-
-if WITH_WWAN
-nm_applet_SOURCES += \
-	applet-device-broadband.h \
-	applet-device-broadband.c
-endif
-
-BUILT_SOURCES = \
-	applet-resources.h \
-	applet-resources.c
-
-nm_applet_LDADD = \
-	-lm \
-	$(GTK_LIBS) \
-	$(LIBNM_LIBS) \
-	$(LIBSECRET_LIBS) \
-	$(NOTIFY_LIBS) \
-	$(MM_GLIB_LIBS) \
-	$(APPINDICATOR_LIBS) \
-	${top_builddir}/src/utils/libutils-libnm.la \
-	${top_builddir}/src/wireless-security/libwireless-security-libnm.la \
-	${top_builddir}/src/libnma/libnma.la
-
-applet-resources.h: $(srcdir)/applet.gresource.xml
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-header --internal
-
-applet-resources.c: $(srcdir)/applet.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/applet.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-source --internal
-
-EXTRA_DIST = \
-	8021x.ui \
-	gsm-unlock.ui \
-	info.ui \
-	applet.gresource.xml