diff options
| author | Paul Fertser <fercerpav@gmail.com> | 2014-04-28 15:20:41 +0400 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2014-04-29 07:30:54 +1000 |
| commit | 72bbd6c5a327bdc1d5ea8cb12502640860b1fc44 (patch) | |
| tree | aae10e6a2f9842c13b1b6cec5044416a04c39d11 /Makefile.in | |
| parent | 799585fa2e3f2705fe351b63b25978dc1c5a4bc4 (diff) | |
| download | jimtcl-72bbd6c5a327bdc1d5ea8cb12502640860b1fc44.zip jimtcl-72bbd6c5a327bdc1d5ea8cb12502640860b1fc44.tar.gz jimtcl-72bbd6c5a327bdc1d5ea8cb12502640860b1fc44.tar.bz2 | |
Makefile.in: add LIBS handling
In the autoconf universe LDFLAGS are used for all linker flags, and
LIBS are used to specify additional libraries. Autosetup has support
for that but Makefile.in needs to honour them too.
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index b8eb43a..6d45b15 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,6 +22,7 @@ CFLAGS = @CFLAGS@ @CCOPTS@ CXXFLAGS = @CXXFLAGS@ @CXXOPTS@ LDFLAGS = @LDFLAGS@ LDLIBS += @LDLIBS@ +LIBS += @LIBS@ exec_prefix ?= @exec_prefix@ prefix ?= @prefix@ @@ -79,7 +80,7 @@ install-docs: @endif $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o - $(JIMSH_CC) @SH_LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o initjimsh.o $(LIBJIM) $(LDLIBS) + $(JIMSH_CC) @SH_LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o initjimsh.o $(LIBJIM) $(LDLIBS) $(LIBS) @if JIM_INSTALL install: all @TCL_EXTS@ install-exec install-docs @@ -132,7 +133,7 @@ $(LIBJIM): $(OBJS) $(RANLIB) $@ @else $(LIBJIM): $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(SH_LDFLAGS) -o $@ $(OBJS) $(LDLIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $(SH_LDFLAGS) -o $@ $(OBJS) $(LDLIBS) $(LIBS) @endif # Note that $> $^ is for compatibility with both GNU make and BSD make |