1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
configure.ac | 3 +--
src/bin/MakeRules.in | 2 +-
src/lib/libderiv/Makefile.library | 2 +-
src/lib/libint/Makefile.library | 2 +-
src/lib/libr12/Makefile.library | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index dc86e88..8cc3aac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -317,12 +317,11 @@ LIBS=$withval
echo Using extra libraries: $withval
)
-LDFLAGS=
LIBDIRS=
AC_ARG_WITH(libdirs,
[ --with-libdirs Specifies library directories (-Ldir1 -Ldir2).],
LIBDIRS=$withval
-LDFLAGS=$withval
+LDFLAGS="$LDFLAGS $withval"
echo Using extra library directories: $withval
)
diff --git a/src/bin/MakeRules.in b/src/bin/MakeRules.in
index 5b90607..8ea5005 100644
--- a/src/bin/MakeRules.in
+++ b/src/bin/MakeRules.in
@@ -3,7 +3,7 @@ HAVE_MAKERULES = yes
BINOBJ = $(BUILD_CSRC:%.c=%.$(OBJSUF)) $(BUILD_CXXSRC:%.cc=%.$(OBJSUF))
$(BUILD_BINARY): $(BINOBJ)
- $(LD) $^ $(LDFLAGS) $(SYSLIBS) -o $@
+ $(LD) $(LDFLAGS) $^ $(SYSLIBS) -o $@
.PHONY: install install_inc install_target uninstall clean oclean distclean targetclean realclean
install::
diff --git a/src/lib/libderiv/Makefile.library b/src/lib/libderiv/Makefile.library
index ee152ef..8debfe8 100644
--- a/src/lib/libderiv/Makefile.library
+++ b/src/lib/libderiv/Makefile.library
@@ -23,7 +23,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
# this is how shared library is made
$(TOPDIR)/lib/$(NAME).la: $(LIBOBJ)
- $(LTLINK) $(CXX) -o $@ $^ $(LTLINKLIBOPTS)
+ $(LTLINK) $(CXX) $(LDFLAGS) -o $@ $^ $(LTLINKLIBOPTS)
$(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
diff --git a/src/lib/libint/Makefile.library b/src/lib/libint/Makefile.library
index 23e2918..01c4225 100644
--- a/src/lib/libint/Makefile.library
+++ b/src/lib/libint/Makefile.library
@@ -41,7 +41,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
# this is how shared library is made
$(TOPDIR)/lib/$(NAME).la: $(LIBOBJ)
- $(LTLINK) $(CXX) -o $@ $^ $(LTLINKLIBOPTS)
+ $(LTLINK) $(CXX) $(LDFLAGS) -o $@ $^ $(LTLINKLIBOPTS)
$(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
diff --git a/src/lib/libr12/Makefile.library b/src/lib/libr12/Makefile.library
index 1510807..26d47a4 100644
--- a/src/lib/libr12/Makefile.library
+++ b/src/lib/libr12/Makefile.library
@@ -47,7 +47,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
# this is how shared library is made
$(TOPDIR)/lib/$(NAME).la: $(LIBOBJ)
- $(LTLINK) $(CXX) -o $@ $^ $(LTLINKLIBOPTS)
+ $(LTLINK) $(CXX) $(LDFLAGS) -o $@ $^ $(LTLINKLIBOPTS)
$(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
|
GitWeb