device: renew dhcp leases on awake for software devices

[NetworkManager.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b41bfa9..a79bddc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,22 +2,28 @@ include $(GLIB_MAKEFILE)
 
 SUBDIRS = \
        . \
-       include \
-       libnm-util \
-       libnm-glib \
+       shared \
        introspection \
+       libnm-core \
+       libnm \
        src \
        callouts \
-       cli \
-       tui \
+       clients \
        tools \
        policy \
        data \
-       test \
        po \
-       docs \
        man \
-       examples \
+       examples
+
+if WITH_LEGACY_LIBRARIES
+SUBDIRS += \
+       libnm-util \
+       libnm-glib
+endif
+
+SUBDIRS += \
+       docs \
        vapi
 
 @GNOME_CODE_COVERAGE_RULES@
@@ -36,30 +42,31 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --enable-tests=yes \
        --with-valgrind=no \
        --enable-gtk-doc \
-       --enable-more-warnings=yes \
+       --enable-more-warnings=error \
        --with-udev-dir=$$dc_install_base/lib/udev \
        --with-wext=no \
        --enable-ifcfg-rh \
-       --enable-ifcfg-suse \
        --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
 
 cscope:
-       cscope -b -q -R -Iinclude -ssrc -slibnm-glib -slibnm-util -scli/src;
-
-libgsystem_srcpath := libgsystem
-libgsystem_cflags := $(filter-out -DGLIB_VERSION%,$(GLIB_CFLAGS)) -I$(srcdir)/libgsystem
-libgsystem_libs = $(GLIB_LIBS)
-include libgsystem/Makefile-libgsystem.am
-noinst_LTLIBRARIES = libgsystem.la
+       cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -slibnm-glib -slibnm-util -sclients;
 
 .PHONY: cscope