device: renew dhcp leases on awake for software devices

[NetworkManager.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e407d38..a79bddc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,47 +1,72 @@
 include $(GLIB_MAKEFILE)
 
 SUBDIRS = \
-       include \
-       libnm-util \
-       libnm-glib \
+       . \
+       shared \
        introspection \
+       libnm-core \
+       libnm \
        src \
        callouts \
-       cli \
+       clients \
        tools \
        policy \
        data \
-       initscript \
-       test \
        po \
        man \
-       docs \
        examples
 
+if WITH_LEGACY_LIBRARIES
+SUBDIRS += \
+       libnm-util \
+       libnm-glib
+endif
+
+SUBDIRS += \
+       docs \
+       vapi
+
+@GNOME_CODE_COVERAGE_RULES@
+
 EXTRA_DIST = \
        CONTRIBUTING \
        NetworkManager.pc.in \
        intltool-extract.in \
        intltool-merge.in \
        intltool-update.in \
-       Makefile.glib
+       Makefile.glib \
+       autogen.sh \
+       valgrind.suppressions
 
 DISTCHECK_CONFIGURE_FLAGS = \
-       --with-tests=yes \
-       --with-docs=yes \
-       --enable-more-warnings=yes \
+       --enable-tests=yes \
+       --with-valgrind=no \
+       --enable-gtk-doc \
+       --enable-more-warnings=error \
        --with-udev-dir=$$dc_install_base/lib/udev \
-       --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+       --with-wext=no \
+       --enable-ifcfg-rh \
+       --enable-ifupdown \
+       --enable-ifnet
+
+if BUILD_SETTING_DOCS
+dist-check-setting-docs:
+else
+dist-check-setting-docs:
+       @echo "*** gobject-introspection and pygobject are needed to run 'make dist'. ***"
+       @false
+endif
+
+dist: dist-check-setting-docs
 
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = NetworkManager.pc
 
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
 CLEANFILES = cscope.in.out cscope.out cscope.po.out
 
-.PHONY: cscope
 cscope:
-       cscope -b -q -R -Iinclude -ssrc -slibnm-glib -slibnm-util -scli/src;
+       cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -slibnm-glib -slibnm-util -sclients;
+
+.PHONY: cscope