diff options
| author | Michael Biebl <biebl@debian.org> | 2011-04-08 07:31:15 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-04-08 07:31:15 +0200 |
| commit | 9f612fa9c09bbdc00071d871316da870c6bf0023 (patch) | |
| tree | 9c1be60eceefb3b069df4d2780f9c14967a62edc /Makefile.am | |
| parent | af468d82c62191b070d569257eb2f2ac61da98cc (diff) | |
| parent | f75dd6fd1975146623052b843b182dc32c3fbe46 (diff) | |
Merge commit 'upstream/0.8.998' into experimental
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 64be5c85..adb2907b 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 \ @@ -29,11 +28,13 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-tests=yes \ --with-docs=yes \ --with-udev-dir=$$dc_install_base/lib/udev \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \ + --enable-wimax=no DISTCLEANFILES = intltool-extract intltool-merge intltool-update pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = NetworkManager.pc -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + |