[network-manager-applet/th/build-non-recursive-make-bgo778400: 17/21] build: add direct dependencies instead using BUILT_SOURCES (5)
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/th/build-non-recursive-make-bgo778400: 17/21] build: add direct dependencies instead using BUILT_SOURCES (5)
- Date: Thu, 9 Feb 2017 17:57:47 +0000 (UTC)
commit 52af60920f569fd7c7eefaa9d3c000c050da71be
Author: Thomas Haller <thaller redhat com>
Date: Thu Feb 9 16:51:20 2017 +0100
build: add direct dependencies instead using BUILT_SOURCES (5)
Makefile.am | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 366c879..0b2e064 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -693,23 +693,23 @@ 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
+CLEANFILES += \
+ $(nm_applet_h_gen) \
+ $(nm_applet_c_gen)
-bin_PROGRAMS += src/nm-applet
+nm_applet_h_gen = \
+ src/applet-resources.h
-src_nm_applet_SOURCES = \
- src/applet-resources.h \
- src/applet-resources.c \
- \
+nm_applet_c_gen = \
+ src/applet-resources.c
+
+nm_applet_hc_real = \
src/main.c \
src/applet.c \
src/applet.h \
@@ -736,11 +736,18 @@ src_nm_applet_SOURCES = \
src/fallback-icon.h
if WITH_WWAN
-src_nm_applet_SOURCES += \
+nm_applet_hc_real += \
src/applet-device-broadband.h \
src/applet-device-broadband.c
endif
+bin_PROGRAMS += src/nm-applet
+
+src_nm_applet_SOURCES = \
+ $(nm_applet_h_gen) \
+ $(nm_applet_c_gen) \
+ $(nm_applet_hc_real)
+
src_nm_applet_CPPFLAGS = \
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4 \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4 \
@@ -774,6 +781,7 @@ src_nm_applet_LDADD = \
$(APPINDICATOR_LIBS) \
-lm
+$(src_nm_applet_OBJECTS): $(nm_applet_h_gen)
EXTRA_DIST += \
src/8021x.ui \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]