From 8baa1aca8dfd35e3190d7d5655eb83b5b901e263 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Apr 2011 10:42:53 +0200 Subject: Imported Upstream version 0.8.4.0 --- Makefile.am | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index adb2907b..64be5c85 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,12 @@ SUBDIRS = \ marshallers \ - include \ libnm-util \ libnm-glib \ - introspection \ src \ + include \ + introspection \ callouts \ + system-settings \ cli \ tools \ policy \ @@ -28,13 +29,11 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-tests=yes \ --with-docs=yes \ --with-udev-dir=$$dc_install_base/lib/udev \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \ - --enable-wimax=no + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) DISTCLEANFILES = intltool-extract intltool-merge intltool-update pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = NetworkManager.pc -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - +ACLOCAL_AMFLAGS = -I m4 -- cgit 1.3.0-6-gf8a5 From 9f806e97a24bba61417ae312fcc0da40914266fb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 4 May 2011 21:35:41 +0200 Subject: Imported Upstream version 0.8.999 --- Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 64be5c85..c128368c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,11 @@ SUBDIRS = \ marshallers \ + include \ libnm-util \ libnm-glib \ - src \ - include \ introspection \ + src \ callouts \ - system-settings \ cli \ tools \ policy \ @@ -28,6 +27,7 @@ EXTRA_DIST = \ DISTCHECK_CONFIGURE_FLAGS = \ --with-tests=yes \ --with-docs=yes \ + --enable-more-warnings=yes \ --with-udev-dir=$$dc_install_base/lib/udev \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @@ -36,4 +36,5 @@ DISTCLEANFILES = intltool-extract intltool-merge intltool-update pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = NetworkManager.pc -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + -- cgit 1.3.0-6-gf8a5