summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2012-01-24 14:48:20 +0100
committerSimon Josefsson <simon@josefsson.org>2012-01-24 14:57:19 +0100
commit94138b8e4fe7edf901bc239f9b5dbe14aea68dc6 (patch)
tree691b6fb4645cd563dd8ce90ab1c5fd86704f36b9 /Makefile.am
parent836c75deeaa0b1d046e3162ca206096298da463d (diff)
downloadgnutls-94138b8e4fe7edf901bc239f9b5dbe14aea68dc6.tar.gz
Move libopts/ to src/libopts/. Drop gaa remains.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am10
1 files changed, 2 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index d63830d82a..06fdb1d09b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,19 +21,13 @@
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests
-SUBDIRS = gl lib extra po
-
-if NEED_LIBOPTS
-SUBDIRS += libopts
-endif
-
-SUBDIRS += src doc tests
+SUBDIRS = gl lib extra po src doc tests
if HAVE_GUILE
SUBDIRS += guile
endif
-ACLOCAL_AMFLAGS = -I m4 -I gl/m4
+ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I src/libopts/m4
EXTRA_DIST = cfg.mk maint.mk .clcopying