diff options
Diffstat (limited to 'libnm-core/Makefile.in')
| -rw-r--r-- | libnm-core/Makefile.in | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libnm-core/Makefile.in b/libnm-core/Makefile.in index 6f502e38..f4b6bcd0 100644 --- a/libnm-core/Makefile.in +++ b/libnm-core/Makefile.in @@ -120,7 +120,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(libnminclude_HEADERS) \ $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = nm-version.h +CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -288,7 +288,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.libnm-core \ - $(srcdir)/nm-version.h.in $(top_srcdir)/build-aux/depcomp + $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -437,6 +437,7 @@ LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -578,16 +579,17 @@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ with_valgrind = @with_valgrind@ SUBDIRS = . tests -AM_CPPFLAGS = -I${top_srcdir}/include -DG_LOG_DOMAIN=\""libnm"\" \ - -DLOCALEDIR=\"$(datadir)/locale\" -DNETWORKMANAGER_COMPILATION \ +AM_CPPFLAGS = -I${top_srcdir}/include -I${top_builddir}/include \ + -DG_LOG_DOMAIN=\""libnm"\" -DLOCALEDIR=\"$(datadir)/locale\" \ + -DNETWORKMANAGER_COMPILATION \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE $(GLIB_CFLAGS) \ $(am__append_1) $(am__append_4) noinst_LTLIBRARIES = libnm-core.la core = $(top_srcdir)/libnm-core core_build = $(top_builddir)/libnm-core libnm_core_headers = \ + $(top_builddir)/include/nm-version-macros.h \ $(core_build)/nm-core-enum-types.h \ - $(core_build)/nm-version.h \ $(core)/nm-connection.h \ $(core)/nm-core-types.h \ $(core)/nm-dbus-interface.h \ @@ -622,6 +624,7 @@ libnm_core_headers = \ $(core)/nm-setting.h \ $(core)/nm-simple-connection.h \ $(core)/nm-utils.h \ + $(core)/nm-version.h \ $(core)/nm-vpn-dbus-interface.h libnm_core_private_headers = \ @@ -682,7 +685,7 @@ libnminclude_HEADERS = $(libnm_core_headers) libnm_core_la_SOURCES = $(libnm_core_sources) \ $(libnm_core_private_headers) $(am__append_2) $(am__append_5) GLIB_GENERATED = nm-core-enum-types.h nm-core-enum-types.c -nm_core_enum_types_sources = $(notdir $(libnminclude_HEADERS)) +nm_core_enum_types_sources = $(filter-out %nm-core-enum-types.h,$(libnminclude_HEADERS)) GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM libnm_core_la_LIBADD = $(GLIB_LIBS) $(UUID_LIBS) $(am__append_3) \ @@ -724,8 +727,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -nm-version.h: $(top_builddir)/config.status $(srcdir)/nm-version.h.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) |