diff options
| author | Simon Josefsson <simon@josefsson.org> | 2004-08-15 00:17:32 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2004-08-15 00:17:32 +0000 |
| commit | beb44368395804c5d905b8d23fcc092521ea6efc (patch) | |
| tree | caff60618036e2d9fd4be71aa0c8859126d5a823 | |
| parent | 12af6333fedd7a0e33d039c58dd903ba25fff5a4 (diff) | |
| download | gnutls-beb44368395804c5d905b8d23fcc092521ea6efc.tar.gz | |
Fix -I's, for srcdir != objdir builds (e.g., 'make distcheck').
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | libextra/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 6df8e20703..c63f675d5c 100644 --- a/configure.in +++ b/configure.in @@ -586,9 +586,9 @@ AC_CONFIG_FILES(lib/gnutls.h.in) AC_CONFIG_COMMANDS([includes/gnutls/gnutls.h],[[ test -f lib/gnutls.h.in || (echo "Could not generate includes/gnutls/gnutls.h" && exit 1) cat lib/gnutls.h.in > includes/gnutls/gnutls.h - cat lib/gnutls_ui.h >> includes/gnutls/gnutls.h + cat $srcdir/lib/gnutls_ui.h >> includes/gnutls/gnutls.h echo "" >> includes/gnutls/gnutls.h - cat lib/gnutls_errors_int.h | grep -v _INT_ >> includes/gnutls/gnutls.h + cat $srcdir/lib/gnutls_errors_int.h | grep -v _INT_ >> includes/gnutls/gnutls.h echo "" >> includes/gnutls/gnutls.h echo "#ifdef __cplusplus" >> includes/gnutls/gnutls.h echo "}" >> includes/gnutls/gnutls.h diff --git a/lib/Makefile.am b/lib/Makefile.am index 118942e9c7..e48ce5ff56 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I../libextra -Iminitasn1/ -I../libextra/openpgp/ -I../libextra/opencdk -Ix509/ -I../includes $(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS) +INCLUDES = -I$(top_srcdir)/libextra -I$(srcdir)/minitasn1 -I$(top_srcdir)/libextra/openpgp/ -I$(top_srcdir)/libextra/opencdk -I$(srcdir)/x509 -I$(top_srcdir)/includes $(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS) bin_SCRIPTS = libgnutls-config m4datadir = $(datadir)/aclocal diff --git a/libextra/Makefile.am b/libextra/Makefile.am index ddf2673be6..173e9a995d 100644 --- a/libextra/Makefile.am +++ b/libextra/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I../lib -I../includes -I../lib/minitasn1/ $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBTASN1_CFLAGS) -Iopencdk/ -Iopenpgp/ +INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/includes -I$(top_srcdir)/lib/minitasn1 $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBTASN1_CFLAGS) -I$(srcdir)/opencdk -I$(srcdir)/openpgp AM_CFLAGS = -DVERSION=\"gnutls/opencdk\" bin_SCRIPTS = libgnutls-extra-config DIST_SUBDIRS = openpgp opencdk diff --git a/src/Makefile.am b/src/Makefile.am index ee72194828..1dd1781c44 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = common.h crypt.gaa crypt-gaa.h README.srptool \ SUBDIRS = srp x509 openpgp cfg INCLUDES = -I../lib -I../libtasn1/lib -I../includes $(LIBOPENCDK_CFLAGS) \ - -I../gl -Icfg/ + -I$(top_srcdir)/gl -Icfg/ bin_PROGRAMS = gnutls-serv gnutls-cli srptool gnutls-cli-debug certtool gnutls_serv_SOURCES = serv-gaa.c serv.c common.c |