Refer to files with explicit path. Patch by LRN.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index c279057af1392084835df861bca96d02001db920..4e915a5371c4f5ea757f83957b67d894f51dcd75 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -388,7 +388,7 @@ stamp_functions: gnutls-api.texi x509-api.texi pgp-api.texi pkcs12-api.texi tpm-
 
 stamp_enums: enums.texi
        -mkdir enums
-       $(srcdir)/scripts/split-texi.pl enums enum < enums.texi
+       $(srcdir)/scripts/split-texi.pl enums enum < $(srcdir)/enums.texi
        echo $@ > $@
        $(MAKE) compare-makefile
 
@@ -397,7 +397,7 @@ $(ENUMS): stamp_enums
 $(FUNCS): stamp_functions
 
 compare-makefile: enums.texi
-       ENUMS=`grep '^@c ' enums.texi | sed 's/@c //g' | sort`; \
+       ENUMS=`grep '^@c ' $(srcdir)/enums.texi | sed 's/@c //g' | sort`; \
        STR=""; \
        for i in $$ENUMS; do \
                STR="$$STR\nENUMS += enums/$$i"; \
@@ -406,14 +406,14 @@ compare-makefile: enums.texi
                perl -p -e "s,^ENUMS =,ENUMS =$$STR," > tmp-$@; \
        diff -u $(srcdir)/Makefile.am tmp-$@
        rm -f tmp-$@
-       FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl`; \
+       FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h $(top_builddir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl`; \
        MANS=""; \
        for i in $$FUNCS; do \
                MANS="$$MANS\nFUNCS += functions/$$i\nFUNCS += functions/$$i.short"; \
        done; \
-       grep -v -e '^FUNCS += ' Makefile.am | \
-               perl -p -e "s,^FUNCS =,FUNCS =$$MANS," > tmp-$@; \
-       diff -u $(srcdir)/Makefile.am tmp-$@
+       grep -v -e '^FUNCS += ' $(srcdir)/Makefile.am | \
+               perl -p -e "s,^FUNCS =,FUNCS =$$MANS," | sort > tmp-$@; \
+       sort $(srcdir)/Makefile.am | diff -u - tmp-$@
        rm -f tmp-$@
 
 .PHONY: compare-makefile

diff --git a/lib/Makefile.am b/lib/Makefile.am
index a3090820bc2ba49ca3adc9f0c36923d959d83eaf..8df6d9b4d86e97a1a9f7e2a70e24db541b2f50de 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -68,7 +68,9 @@ COBJECTS = gnutls_record.c gnutls_compress.c debug.c gnutls_cipher.c  \
        gnutls_auth.c gnutls_v2_compat.c gnutls_datum.c                 \
        gnutls_session_pack.c gnutls_mpi.c gnutls_pk.c gnutls_cert.c    \
        gnutls_global.c gnutls_constate.c gnutls_anon_cred.c            \
-       pkix_asn1_tab.c gnutls_asn1_tab.c gnutls_mem.c gnutls_ui.c      \
+       $(srcdir)/pkix_asn1_tab.c                               \
+       $(srcdir)/gnutls_asn1_tab.c                             \
+       gnutls_mem.c gnutls_ui.c                                        \
        gnutls_sig.c gnutls_ecc.c gnutls_dh_primes.c gnutls_alert.c     \
        system.c gnutls_str.c gnutls_state.c gnutls_x509.c              \
        gnutls_rsa_export.c gnutls_helper.c gnutls_supplemental.c       \
@@ -176,8 +178,8 @@ libgnutlsxx_la_LIBADD = libgnutls.la
 
 endif
 
-pkix_asn1_tab.c: pkix.asn
-       -asn1Parser pkix.asn pkix_asn1_tab.c
+pkix_asn1_tab.c: $(srcdir)/pkix.asn
+       -asn1Parser $(srcdir)/pkix.asn pkix_asn1_tab.c
 
-gnutls_asn1_tab.c: gnutls.asn
-       -asn1Parser gnutls.asn gnutls_asn1_tab.c
+gnutls_asn1_tab.c: $(srcdir)/gnutls.asn
+       -asn1Parser $(srcdir)/gnutls.asn gnutls_asn1_tab.c