Small linker changes

Author: jgg
Date: 1999-01-17 21:11:40 GMT
Small linker changes

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 6af5ebe42f3859b6668d9f48e67e864ebd4bf080..d31e1938596b82778088f76afab96ad919366380 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -10,6 +10,7 @@ CXXFLAGS+= @CXXFLAGS@ @X_CFLAGS@
 # Linker stuff
 PICFLAGS+= -fPIC -DPIC
 LFLAGS+= @LDFLAGS@
+LEFLAGS+= 
 XLIBS:=@X_LIBS@ @X_PRE_LIBS@ @X11LIB@ @X_EXTRA_LIBS@
 
 # Dep generation - this only works for gnu stuff

diff --git a/buildlib/program.mak b/buildlib/program.mak
index 7c065da1a1d0e2ddc368a815cc69d53c67a74a6d..9a19a261fb450c5e7175f2242cc8909aad834448 100644 (file)
--- a/buildlib/program.mak
+++ b/buildlib/program.mak
@@ -31,7 +31,7 @@ veryclean/$(LOCAL): clean/$(LOCAL)
 # The binary build rule
 $($(LOCAL)-BIN): $($(LOCAL)-OBJS)
        echo Building program $@
-       $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $(filter %.o,$^) $($(LOCAL)-SLIBS)
+       $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $(filter %.o,$^) $($(@F)-SLIBS) $(LEFLAGS)
 
 # Compilation rules
 vpath %.cc $(SUBDIRS)