diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2010-12-08 15:10:06 -0700 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:08 +0100 |
| commit | 56a9114bbc3160ec25c0ecf0020f85b56830d0cf (patch) | |
| tree | b2f1bec8a17860c9520f47e85ed92ba6e444ca92 /configure.ac | |
| parent | 7e8cd2b9ae5af5d0cd32ee1369cbc7a0a35b316c (diff) | |
Recurse into 'lib' first; Update makefiles
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 7308b984..2a58233a 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,6 @@ VERSION=AC_PACKAGE_VERSION AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(crystfel, "$VERSION") -AC_CONFIG_FILES(lib/Makefile) - AC_PROG_CC gl_EARLY AC_PROG_AWK @@ -148,5 +146,6 @@ CFLAGS="$CFLAGS $LIBTIFF_CFLAGS -D_GNU_SOURCE $libPNG_CFLAGS $Cairo_CFLAGS" LIBS="$LIBS $HDF5_LIBS -lm -lz $GSL_LIBS $GTK_LIBS $OPENCL_LIBS -pthread" LIBS="$LIBS $LIBTIFF_LIBS $libPNG_LIBS $Cairo_LIBS" -AC_OUTPUT(Makefile src/Makefile data/Makefile doc/Makefile scripts/Makefile) -AC_OUTPUT(doc/examples/Makefile) +AC_CONFIG_FILES(Makefile src/Makefile data/Makefile doc/Makefile) +AC_CONFIG_FILES(scripts/Makefile doc/examples/Makefile lib/Makefile) +AC_OUTPUT |