[network-manager-applet/th/build-non-recursive-make-bgo778400: 14/16] build: add direct dependencies instead using BUILT_SOURCES (3)
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/th/build-non-recursive-make-bgo778400: 14/16] build: add direct dependencies instead using BUILT_SOURCES (3)
- Date: Thu, 9 Feb 2017 16:04:31 +0000 (UTC)
commit a263b0e8881c1bf1491de648f8c3521a98d08891
Author: Thomas Haller <thaller redhat com>
Date: Thu Feb 9 16:25:40 2017 +0100
build: add direct dependencies instead using BUILT_SOURCES (3)
Makefile.am | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index beda3f3..f81f271 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -444,33 +444,30 @@ EXTRA_DIST += \
###############################################################################
-BUILT_SOURCES += \
- src/libnma/nma-resources.h \
- src/libnma/nma-resources.c
-
src/libnma/nma-resources.h: src/libnma/nma.gresource.xml
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnma
--generate-header --internal
src/libnma/nma-resources.c: src/libnma/nma.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES)
--sourcedir=$(srcdir)/src/libnma --generate-dependencies $(srcdir)/src/libnma/nma.gresource.xml)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnma
--generate-source --internal
+CLEANFILES += \
+ $(libnma_h_priv_gen) \
+ $(libnma_c_gen)
-src_libnma_libnmadir = $(includedir)/libnma
+libnma_h_priv_gen = \
+ src/libnma/nma-resources.h
-src_libnma_libnma_HEADERS = \
+libnma_c_gen = \
+ src/libnma/nma-resources.c
+
+libnma_h_pub = \
src/libnma/nma-wifi-dialog.h \
src/libnma/nma-mobile-wizard.h \
src/libnma/nma-mobile-providers.h \
src/libnma/nma-vpn-password-dialog.h \
src/libnma/nma-ui-utils.h
-
-lib_LTLIBRARIES += src/libnma/libnma.la
-
-src_libnma_libnma_la_SOURCES = \
- src/libnma/nma-resources.h \
- src/libnma/nma-resources.c \
- \
+libnma_c_real = \
src/libnma/nma-wifi-dialog.c \
src/libnma/nma-mobile-wizard.c \
src/libnma/nma-mobile-providers.c \
@@ -478,6 +475,17 @@ src_libnma_libnma_la_SOURCES = \
src/libnma/nma-ui-utils.c \
src/libnma/init.c
+src_libnma_libnmadir = $(includedir)/libnma
+
+src_libnma_libnma_HEADERS = \
+ $(libnma_h_pub)
+
+lib_LTLIBRARIES += src/libnma/libnma.la
+
+src_libnma_libnma_la_SOURCES = \
+ $(libnma_c_gen) \
+ $(libnma_c_real)
+
src_libnma_libnma_la_CFLAGS = \
-DICONDIR=\""$(datadir)/icons"\" \
-DBINDIR=\""$(bindir)"\" \
@@ -501,6 +509,8 @@ src_libnma_libnma_la_LIBADD = \
$(LIBNM_LIBS) \
$(GUDEV_LIBS)
+$(src_libnma_libnma_la_OBJECTS): $(libnma_h_priv_gen)
+
EXTRA_src_libnma_libnma_la_DEPENDENCIES = src/libnma/libnma.ver
src_libnma_libnma_la_LDFLAGS = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]