From 0386576748375952aacb56dbf083ffb77d538feb Mon Sep 17 00:00:00 2001 From: Francesco Salvestrini Date: Tue, 25 Nov 2008 23:31:57 +0100 Subject: [PATCH] Added missing archive to the linking --- src/Makefile.am | 8 +++++--- src/gnulib/Makefile.am | 27 ++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 740d7f6..11f9d15 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,7 @@ include $(top_srcdir)/Makefile.maint AUTOMAKE_OPTIONS = subdir-objects -SUBDIRS = gnulib +SUBDIRS = gnulib . ## ## User related targets @@ -46,7 +46,8 @@ beacon_LDADD = \ libfs.a \ libnet.a \ libmisc.a \ - libvm.a + libvm.a \ + gnulib/libgnu.a beacon_LDFLAGS = if ENABLE_LUA beacon_LDFLAGS += \ @@ -61,7 +62,8 @@ distribute_LDADD = \ libconf.a \ libfs.a \ libmisc.a \ - libnet.a + libnet.a \ + gnulib/libgnu.a ## Libraries diff --git a/src/gnulib/Makefile.am b/src/gnulib/Makefile.am index e90dbbd..74fa8e6 100644 --- a/src/gnulib/Makefile.am +++ b/src/gnulib/Makefile.am @@ -9,7 +9,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=./src/gnulib --m4-base=./tools/autotools/m4 --doc-base=doc --tests-base=tests --aux-dir=./tools/autotools --lgpl --no-libtool --macro-prefix=GNULIB --no-vc-files crypto/md5 crypto/sha1 getopt +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=./src/gnulib --m4-base=./tools/autotools/m4 --doc-base=doc --tests-base=tests --aux-dir=./tools/autotools --lgpl --no-libtool --macro-prefix=GNULIB --no-vc-files crypto/md5 crypto/sha1 dirent getopt AUTOMAKE_OPTIONS = 1.5 gnits @@ -53,6 +53,31 @@ EXTRA_libgnu_a_SOURCES += sha1.c ## end gnulib module crypto/sha1 +## begin gnulib module dirent + +BUILT_SOURCES += $(DIRENT_H) + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +dirent.h: dirent.in.h + rm -f $@-t $@ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ + -e 's|@''GNULIB_DIRFD''@|$(GNULIB_DIRFD)|g' \ + -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \ + -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ + -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ + < $(srcdir)/dirent.in.h; \ + } > $@-t + mv $@-t $@ +MOSTLYCLEANFILES += dirent.h dirent.h-t + +EXTRA_DIST += dirent.in.h + +## end gnulib module dirent + ## begin gnulib module getopt BUILT_SOURCES += $(GETOPT_H) -- 2.11.4.GIT