aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2018-09-19 02:14:02 +0000
committerNIIBE Yutaka <[email protected]>2018-09-19 02:14:02 +0000
commit144f4b3df5200ce056f00e20420cde77eb1f673d (patch)
tree7343d7e9c210acbc00b573d306ff6ba6f8665fbd
parentAccept pkgconf difference for spaces. (diff)
downloadlibgpg-error-144f4b3df5200ce056f00e20420cde77eb1f673d.tar.gz
libgpg-error-144f4b3df5200ce056f00e20420cde77eb1f673d.zip
src: Fix Makefile for BSD make.
* src/Makefile.am (BUILT_SOURCES): Add srcdir to err-sources.h and err-codes.h. (CLEANFILES): Move err-sources.h and err-codes.h to... (MAINTAINERCLEANFILES): ... this new target. (gpg_error_LDADD): Remove ./ to generate libgpg-error.la. -- BSD make is not kind enough to mix path and target. Signed-off-by: NIIBE Yutaka <[email protected]>
-rw-r--r--src/Makefile.am9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 914768c..925bfdd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,13 +101,14 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
gpg-error-config-new.in gpg-error-config-test.sh gpg-error.pc.in \
$(lock_obj_pub)
-BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
+BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \
+ code-to-errno.h code-from-errno.h \
err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h gpgrt.h \
gpgrt-config gpg-error.def mkw32errmap.map.c
tmp_files = _mkerrcodes.h _gpg-error.def.h mkw32errmap.tab.h mkw32errmap.map.c
-CLEANFILES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
+CLEANFILES = code-to-errno.h code-from-errno.h \
gpg-error.h gpgrt.h gpgrt-config \
mkerrcodes$(EXEEXT_FOR_BUILD) mkerrcodes.h gpg-error.def mkw32errmap.tab.h \
mkw32errmap.map.c err-sources-sym.h err-codes-sym.h errnos-sym.h \
@@ -115,6 +116,8 @@ CLEANFILES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
gpg-error-config gpg-error-config-test.log \
$(tmp_files) lock-obj-pub.native.h
+MAINTAINERCLEANFILES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h
+
TESTS = gpg-error-config-test.sh
#
@@ -215,7 +218,7 @@ libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) $(LIBTHREAD)
gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c
gpg_error_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
-DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
-gpg_error_LDADD = ./libgpg-error.la $(LTLIBINTL)
+gpg_error_LDADD = libgpg-error.la $(LTLIBINTL)
# We build err-sources.h and err-codes.h in the source directory.
# This is needed because gettext does only look into the source