diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2010-12-11 09:48:03 -0800 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:09 +0100 |
| commit | 2e672cf5544e8f9ce60884f4164b0c36ae16b8eb (patch) | |
| tree | 6bdaa11121c04072132b181cb36b027de2cd27fd /configure.ac | |
| parent | 15a97f0489ef604baa2c14dbcdedb9d647c3e712 (diff) | |
Use non-recursive make, as far as possible
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 499957cf..e4fb4bed 100644 --- a/configure.ac +++ b/configure.ac @@ -1,20 +1,18 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(crystfel, 0.2.0, taw@physics.org) -AM_SILENT_RULES([yes]) -VERSION=AC_PACKAGE_VERSION AC_CONFIG_AUX_DIR([build-aux]) - AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(crystfel, "$VERSION") +AM_INIT_AUTOMAKE([subdir-objects]) AC_PROG_CC gl_EARLY +AM_PROG_CC_C_O AC_PROG_AWK AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_RANLIB - +AM_SILENT_RULES([yes]) AC_HEADER_STDC AC_CHECK_HEADERS([fcntl.h stdlib.h unistd.h]) @@ -151,6 +149,5 @@ 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_CONFIG_FILES(Makefile src/Makefile data/Makefile doc/Makefile) -AC_CONFIG_FILES(scripts/Makefile doc/examples/Makefile lib/Makefile) +AC_CONFIG_FILES(Makefile lib/Makefile) AC_OUTPUT |