diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-04-08 13:57:59 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-04-08 14:21:27 +0200 |
| commit | ea5d1884419d58892540c0b77c8bc329c7cb0ca9 (patch) | |
| tree | 045060edea80358bc9bba8508eb631bd20590fbe /cfg.mk | |
| parent | 35239632fdba3ee96d9d98bbf38c2263d08626cb (diff) | |
| download | gnutls-ea5d1884419d58892540c0b77c8bc329c7cb0ca9.tar.gz | |
Use a single configure.ac. This speed ups compilation and
reduces duplication of code (multiple gl/ libraries etc.).
This saves about 2mb in distributed size (compressed).
Diffstat (limited to 'cfg.mk')
| -rw-r--r-- | cfg.mk | 20 |
1 files changed, 15 insertions, 5 deletions
@@ -23,7 +23,7 @@ WFLAGS ?= --enable-gcc-warnings ADDFLAGS ?= CFGFLAGS ?= --enable-gtk-doc --enable-gtk-doc-pdf $(ADDFLAGS) $(WFLAGS) -INDENT_SOURCES = `find . -name \*.[ch] -o -name gnutls.h.in | grep -v -e ^./build-aux/ -e ^./lib/minitasn1/ -e ^./lib/build-aux/ -e ^./lib/gl/ -e ^./gl/ -e ^./libextra/gl/ -e ^./src/cfg/ -e -gaa.[ch] -e asn1_tab.c -e ^./tests/suite/` +INDENT_SOURCES = `find . -name \*.[ch] -o -name gnutls.h.in | grep -v -e ^./build-aux/ -e ^./lib/minitasn1/ -e ^./lib/build-aux/ -e ^./gl/ -e ^./src/cfg/ -e -gaa.[ch] -e asn1_tab.c -e ^./tests/suite/` ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile) .DEFAULT_GOAL := bootstrap @@ -46,7 +46,7 @@ autoreconf: done mv lib/build-aux/config.rpath lib/build-aux/config.rpath- test -f ./configure || autoreconf --install - test `hostname` = "gaggia" && cp lib/gl/m4/size_max.m4 lib/m4/ || true + test `hostname` = "gaggia" && cp gl/m4/size_max.m4 m4/ || true mv lib/build-aux/config.rpath- lib/build-aux/config.rpath update-po: refresh-po @@ -59,10 +59,20 @@ update-po: refresh-po bootstrap: autoreconf ./configure $(CFGFLAGS) +#Two runs the first should add the LGPL components and the +#second the components used by src/ files. glimport: - gnulib-tool --m4-base gl/m4 --add-import - cd lib && gnulib-tool --m4-base gl/m4 --add-import - cd libextra && gnulib-tool --m4-base gl/m4 --add-import + ../gnulib/gnulib-tool --m4-base gl/m4 --tests-base=gl/tests --libtool \ + --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl \ + --aux-dir=build-aux --with-tests --avoid=alignof-tests --avoid=lseek-tests \ + --import crypto/hmac-md5 crypto/md5 extensions havelib lib-msvc-compat lib-symbol-versions \ + byteswap c-ctype func gettext lib-msvc-compat lib-symbol-versions memmem-simple minmax \ + netdb read-file snprintf sockets socklen stdint strcase strverscmp sys_socket sys_stat time_r unistd \ + vasprintf vsnprintf manywarnings warnings netinet_in alloca getpass u64 + ../gnulib/gnulib-tool --m4-base gl/m4 --tests-base=gl/tests --libtool \ + --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl \ + --aux-dir=build-aux --with-tests --avoid=alignof-tests --avoid=lseek-tests \ + --add-import progname version-etc timespec version-etc-fsf gettime # Code Coverage |