[network-manager-applet/th/build-non-recursive-make-bgo778400: 21/21] build: don't dist generated *-resources.[hc] files
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/th/build-non-recursive-make-bgo778400: 21/21] build: don't dist generated *-resources.[hc] files
- Date: Thu, 9 Feb 2017 17:58:08 +0000 (UTC)
commit d3fdeaa523d1b4d139be36d4a0b2b9a173959f3e
Author: Thomas Haller <thaller redhat com>
Date: Thu Feb 9 18:49:50 2017 +0100
build: don't dist generated *-resources.[hc] files
Fixes: a4fa0bf297dbb148bb8ca1818eacaaaef85c803a
Makefile.am | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6410f7e..931c9b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -262,10 +262,11 @@ wireless_security_c_real = \
noinst_LTLIBRARIES += src/wireless-security/libwireless-security-libnm.la
src_wireless_security_libwireless_security_libnm_la_SOURCES = \
- $(wireless_security_c_gen) \
- $(wireless_security_h_gen) \
$(wireless_security_c_real)
+nodist_src_wireless_security_libwireless_security_libnm_la_SOURCES = \
+ $(wireless_security_c_gen)
+
src_wireless_security_libwireless_security_libnm_la_CPPFLAGS = \
"-I$(srcdir)/shared" \
"-I$(srcdir)/src/utils" \
@@ -285,10 +286,11 @@ if WITH_LIBNM_GTK
noinst_LTLIBRARIES += src/wireless-security/libwireless-security-libnm-glib.la
src_wireless_security_libwireless_security_libnm_glib_la_SOURCES = \
- $(wireless_security_c_gen) \
- $(wireless_security_h_gen) \
$(wireless_security_c_real)
+nodist_src_wireless_security_libwireless_security_libnm_glib_la_SOURCES = \
+ $(wireless_security_c_gen)
+
src_wireless_security_libwireless_security_libnm_glib_la_CPPFLAGS = \
$(GTK_CFLAGS) \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
@@ -365,10 +367,11 @@ src_libnm_gtk_libnmgtk_HEADERS = \
lib_LTLIBRARIES += src/libnm-gtk/libnm-gtk.la
src_libnm_gtk_libnm_gtk_la_SOURCES = \
- $(libnm_gtk_h_priv_gen) \
- $(libnm_gtk_c_gen) \
$(libnm_gtk_c_real)
+nodist_src_libnm_gtk_libnm_gtk_la_SOURCES = \
+ $(libnm_gtk_c_gen)
+
src_libnm_gtk_libnm_gtk_la_CFLAGS = \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-DICONDIR=\""$(datadir)/icons"\" \
@@ -491,10 +494,11 @@ src_libnma_libnma_HEADERS = \
lib_LTLIBRARIES += src/libnma/libnma.la
src_libnma_libnma_la_SOURCES = \
- $(libnma_h_priv_gen) \
- $(libnma_c_gen) \
$(libnma_c_real)
+nodist_src_libnma_libnma_la_SOURCES = \
+ $(libnma_c_gen)
+
src_libnma_libnma_la_CFLAGS = \
-DICONDIR=\""$(datadir)/icons"\" \
-DBINDIR=\""$(bindir)"\" \
@@ -636,10 +640,11 @@ connection_editor_hc_real = \
bin_PROGRAMS += src/connection-editor/nm-connection-editor
src_connection_editor_nm_connection_editor_SOURCES = \
- $(connection_editor_h_gen) \
- $(connection_editor_c_gen) \
$(connection_editor_hc_real)
+nodist_src_connection_editor_nm_connection_editor_SOURCES = \
+ $(connection_editor_c_gen)
+
src_connection_editor_nm_connection_editor_CPPFLAGS = \
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4 \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4 \
@@ -755,10 +760,11 @@ endif
bin_PROGRAMS += src/nm-applet
src_nm_applet_SOURCES = \
- $(nm_applet_h_gen) \
- $(nm_applet_c_gen) \
$(nm_applet_hc_real)
+nodist_src_nm_applet_SOURCES = \
+ $(nm_applet_c_gen)
+
src_nm_applet_CPPFLAGS = \
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4 \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4 \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]