device: renew dhcp leases on awake for software devices

[NetworkManager.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cda6437..a79bddc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,33 +1,72 @@
-SUBDIRS = marshallers
+include $(GLIB_MAKEFILE)
+
+SUBDIRS = \
+       . \
+       shared \
+       introspection \
+       libnm-core \
+       libnm \
+       src \
+       callouts \
+       clients \
+       tools \
+       policy \
+       data \
+       po \
+       man \
+       examples
+
+if WITH_LEGACY_LIBRARIES
+SUBDIRS += \
+       libnm-util \
+       libnm-glib
+endif
 
 SUBDIRS += \
-          libnm-util \
-          libnm-glib \
-          src \
-          include \
-          introspection \
-          callouts \
-          system-settings \
-          tools \
-          policy \
-          initscript \
-          test \
-          po \
-          man \
-          docs
+       docs \
+       vapi
+
+@GNOME_CODE_COVERAGE_RULES@
 
 EXTRA_DIST = \
        CONTRIBUTING \
        NetworkManager.pc.in \
        intltool-extract.in \
        intltool-merge.in \
-       intltool-update.in              
+       intltool-update.in \
+       Makefile.glib \
+       autogen.sh \
+       valgrind.suppressions
 
-DISTCHECK_CONFIGURE_FLAGS = --with-tests=yes --with-docs=yes --with-udev-dir=$$dc_install_base/lib/udev
+DISTCHECK_CONFIGURE_FLAGS = \
+       --enable-tests=yes \
+       --with-valgrind=no \
+       --enable-gtk-doc \
+       --enable-more-warnings=error \
+       --with-udev-dir=$$dc_install_base/lib/udev \
+       --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
+CLEANFILES = cscope.in.out cscope.out cscope.po.out
+
+cscope:
+       cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -slibnm-glib -slibnm-util -sclients;
+
+.PHONY: cscope