diff options
| author | Søren Sandmann Pedersen <sandmann@redhat.com> | 2008-09-07 05:14:13 -0400 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@redhat.com> | 2008-09-07 05:14:13 -0400 |
| commit | 30319c425e94c6d0d4b3dbbadf9debe18bdca0a8 (patch) | |
| tree | e8c42fd4cf445427eed1e550183a26a65b70be0f | |
| parent | 96fd30e4c297c2e1b5f766121416c6ab8db08b00 (diff) | |
Go back to using AC_CONFIG_SUBDIRS, but don't use SUBDIRS in Makefile.am anymore
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index f6795a3..3eda7f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = libffi - lib_LTLIBRARIES = libnul.la libnul_la_CFLAGS=-Ilibffi/include @@ -8,6 +6,15 @@ libnul_la_SOURCES = \ invoke.c \ libnul.h +clean-local: + cd libffi && $(MAKE) $(AM_MAKEFLAGS) clean +distclean-local: + cd libffi && $(MAKE) $(AM_MAKEFLAGS) distclean +mostlyclean-local: + cd libffi && $(MAKE) $(AM_MAKEFLAGS) mostlyclean +libffi/libffi_convenience.la: + cd libffi && $(MAKE) $(AM_MAKEFLAGS) all + libnul_la_LIBADD = @DEP_LIBS@ libffi/libffi_convenience.la libnul_la_LDFLAGS = -no-undefined @@ -21,3 +28,4 @@ pkgconfig_DATA = libnul.pc libnulincludedir = $(includedir) libnulinclude_HEADERS = $(top_srcdir)/libnul.h + diff --git a/configure.ac b/configure.ac index 0babe9e..a285174 100644 --- a/configure.ac +++ b/configure.ac @@ -34,11 +34,7 @@ AC_PROG_LIBTOOL AC_C_CHAR_UNSIGNED -# Configure libffi. We don't use AC_CONFIG_SUBDIR because because -# that causes libffi to be installed which we don't want -cd libffi -configure --prefix=`pwd`/inst -cd - +AC_CONFIG_SUBDIRS(libffi) # Check for dependencies PKG_CHECK_MODULES(DEP, glib-2.0) |