diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:52:25 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:52:25 +0000 |
| commit | a9975068c7d55b2fbe46aacf94a36b460fd1d9da (patch) | |
| tree | 4cbf739e2fe10b4b4863ffa60ea499db894e0ddf | |
| parent | d59cbe7f4a3712dbcfda35b843dbafecb38fff18 (diff) | |
Small linker changes
Author: jgg
Date: 1999-01-17 21:11:40 GMT
Small linker changes
| -rw-r--r-- | buildlib/environment.mak.in | 1 | ||||
| -rw-r--r-- | buildlib/program.mak | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index 6af5ebe42..d31e19385 100644 --- 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 7c065da1a..9a19a261f 100644 --- 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) |