From: Nikos Mavrogiannopoulos Date: Fri, 10 Feb 2012 12:42:37 +0000 (+0100) Subject: corrected subdirs for libopts X-Git-Tag: gnutls_3_0_13~84 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4143ace26a4ce0810d373f1f3ff28a2cdf9786f7;p=thirdparty%2Fgnutls.git corrected subdirs for libopts --- diff --git a/Makefile.am b/Makefile.am index 4fdae7178e..6be58fed55 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,10 +23,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests SUBDIRS = gl lib extra po -if NEED_LIBOPTS -SUBDIRS += $(LIBOPTS_DIR) -endif - SUBDIRS += src doc tests if HAVE_GUILE diff --git a/src/Makefile.am b/src/Makefile.am index 90ba6c0e8f..33f3ff3588 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,8 +17,14 @@ # along with this file; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +SUBDIRS = + if ENABLE_CRYWRAP -SUBDIRS = crywrap +SUBDIRS += crywrap +endif + +if NEED_LIBOPTS +SUBDIRS += libopts endif AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)