diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-02-09 16:51:20 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-02-09 17:15:51 +0100 |
| commit | d8e4aa22868b17425753b260a17c8edb43b6dc8e (patch) | |
| tree | b6aa751067d6d137916422700ac055d20110a62f | |
| parent | 872c830cc1f7f89e46124adcd7979a194c5798f7 (diff) | |
| download | network-manager-applet-d8e4aa22868b17425753b260a17c8edb43b6dc8e.tar.gz | |
build: add direct dependencies instead using BUILT_SOURCES (5)
| -rw-r--r-- | Makefile.am | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index ce2719a3..5cac4db9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -688,23 +688,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 \ @@ -731,11 +731,17 @@ 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_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 \ @@ -769,6 +775,7 @@ src_nm_applet_LDADD = \ $(APPINDICATOR_LIBS) \ -lm +$(src_nm_applet_OBJECTS): $(nm_applet_h_gen) EXTRA_DIST += \ src/8021x.ui \ |