[network-manager-applet/th/build-non-recursive-make-bgo778400: 16/18] build: add direct dependencies instead using BUILT_SOURCES (4)



commit bed9ee8374ec4ceb7504e4bf2e695620cc7bb49d
Author: Thomas Haller <thaller redhat com>
Date:   Thu Feb 9 16:46:40 2017 +0100

    build: add direct dependencies instead using BUILT_SOURCES (4)

 Makefile.am |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f81f271..ce2719a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -541,23 +541,23 @@ EXTRA_DIST += \
 
 ###############################################################################
 
-BUILT_SOURCES += \
-       src/connection-editor/ce-resources.h \
-       src/connection-editor/ce-resources.c
-
 src/connection-editor/ce-resources.h: src/connection-editor/ce.gresource.xml
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/connection-editor 
--generate-header --internal
 
 src/connection-editor/ce-resources.c: src/connection-editor/ce.gresource.xml $(shell 
$(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/src/connection-editor --generate-dependencies 
$(srcdir)/src/connection-editor/ce.gresource.xml)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/connection-editor 
--generate-source --internal
 
+CLEANFILES += \
+       $(connection_editor_h_gen) \
+       $(connection_editor_c_gen)
 
-bin_PROGRAMS += src/connection-editor/nm-connection-editor
+connection_editor_h_gen = \
+       src/connection-editor/ce-resources.h
 
-src_connection_editor_nm_connection_editor_SOURCES = \
-       src/connection-editor/ce-resources.h \
-       src/connection-editor/ce-resources.c \
-       \
+connection_editor_c_gen = \
+       src/connection-editor/ce-resources.c
+
+connection_editor_hc_real = \
        src/connection-editor/nm-connection-editor.c \
        src/connection-editor/nm-connection-editor.h \
        src/connection-editor/nm-connection-list.c \
@@ -624,6 +624,12 @@ src_connection_editor_nm_connection_editor_SOURCES = \
        src/connection-editor/connection-helpers.c \
        src/connection-editor/connection-helpers.h
 
+bin_PROGRAMS += src/connection-editor/nm-connection-editor
+
+src_connection_editor_nm_connection_editor_SOURCES = \
+       $(connection_editor_c_gen) \
+       $(connection_editor_hc_real)
+
 src_connection_editor_nm_connection_editor_CPPFLAGS = \
        -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4 \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4 \
@@ -650,6 +656,7 @@ src_connection_editor_nm_connection_editor_LDADD = \
        $(JANSSON_LIBS) \
        -lm
 
+$(src_connection_editor_nm_connection_editor_OBJECTS): $(connection_editor_h_gen)
 
 EXTRA_DIST += \
        src/connection-editor/ce-ip4-routes.ui \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]