mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 02:35:25 +00:00
build: merge shared/Makefile.am into parent Makefile.am
This commit is contained in:
parent
92f4185575
commit
24f566afa0
32
Makefile.am
32
Makefile.am
|
@ -2,7 +2,6 @@ include $(GLIB_MAKEFILE)
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
. \
|
. \
|
||||||
shared \
|
|
||||||
introspection \
|
introspection \
|
||||||
libnm-core \
|
libnm-core \
|
||||||
libnm \
|
libnm \
|
||||||
|
@ -39,7 +38,27 @@ EXTRA_DIST = \
|
||||||
linker-script-settings.ver \
|
linker-script-settings.ver \
|
||||||
Makefile.glib \
|
Makefile.glib \
|
||||||
autogen.sh \
|
autogen.sh \
|
||||||
valgrind.suppressions
|
valgrind.suppressions \
|
||||||
|
\
|
||||||
|
shared/nm-common-macros.h \
|
||||||
|
shared/nm-dbus-compat.h \
|
||||||
|
shared/nm-default.h \
|
||||||
|
shared/nm-dispatcher-api.h \
|
||||||
|
shared/nm-test-libnm-utils.h \
|
||||||
|
shared/nm-test-utils-impl.c \
|
||||||
|
shared/nm-utils/gsystem-local-alloc.h \
|
||||||
|
shared/nm-utils/nm-glib.h \
|
||||||
|
shared/nm-utils/nm-macros-internal.h \
|
||||||
|
shared/nm-utils/nm-shared-utils.c \
|
||||||
|
shared/nm-utils/nm-shared-utils.h \
|
||||||
|
shared/nm-utils/nm-test-utils.h \
|
||||||
|
shared/nm-utils/nm-vpn-editor-plugin-call.h \
|
||||||
|
shared/nm-utils/nm-vpn-plugin-macros.h \
|
||||||
|
shared/nm-utils/nm-vpn-plugin-utils.c \
|
||||||
|
shared/nm-utils/nm-vpn-plugin-utils.h \
|
||||||
|
shared/nm-version-macros.h.in \
|
||||||
|
\
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
DISTCHECK_CONFIGURE_FLAGS = \
|
DISTCHECK_CONFIGURE_FLAGS = \
|
||||||
--enable-tests=yes \
|
--enable-tests=yes \
|
||||||
|
@ -67,7 +86,14 @@ DISTCLEANFILES = intltool-extract intltool-merge intltool-update
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = NetworkManager.pc
|
pkgconfig_DATA = NetworkManager.pc
|
||||||
|
|
||||||
CLEANFILES = cscope.in.out cscope.out cscope.po.out
|
CLEANFILES = \
|
||||||
|
cscope.in.out \
|
||||||
|
cscope.out \
|
||||||
|
cscope.po.out \
|
||||||
|
\
|
||||||
|
shared/nm-version-macros.h \
|
||||||
|
\
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
cscope:
|
cscope:
|
||||||
cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -slibnm-glib -slibnm-util -sclients;
|
cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -slibnm-glib -slibnm-util -sclients;
|
||||||
|
|
|
@ -1136,7 +1136,6 @@ AM_CONDITIONAL(SETTING_DOCS_AVAILABLE, test "$build_setting_docs" = "yes" -o "$h
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
Makefile
|
Makefile
|
||||||
shared/Makefile
|
|
||||||
shared/nm-version-macros.h
|
shared/nm-version-macros.h
|
||||||
src/Makefile
|
src/Makefile
|
||||||
src/tests/Makefile
|
src/tests/Makefile
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
EXTRA_DIST = \
|
|
||||||
nm-utils/gsystem-local-alloc.h \
|
|
||||||
nm-utils/nm-glib.h \
|
|
||||||
nm-utils/nm-macros-internal.h \
|
|
||||||
nm-utils/nm-shared-utils.c \
|
|
||||||
nm-utils/nm-shared-utils.h \
|
|
||||||
nm-utils/nm-test-utils.h \
|
|
||||||
nm-utils/nm-vpn-editor-plugin-call.h \
|
|
||||||
nm-utils/nm-vpn-plugin-macros.h \
|
|
||||||
nm-utils/nm-vpn-plugin-utils.c \
|
|
||||||
nm-utils/nm-vpn-plugin-utils.h \
|
|
||||||
nm-common-macros.h \
|
|
||||||
nm-dbus-compat.h \
|
|
||||||
nm-default.h \
|
|
||||||
nm-dispatcher-api.h \
|
|
||||||
nm-test-libnm-utils.h \
|
|
||||||
nm-test-utils-impl.c \
|
|
||||||
nm-version-macros.h.in \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
CLEANFILES=nm-version.h
|
|
Loading…
Reference in a new issue