From 880e9be46811db19b9346f30ba0ea22f63db59c4 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:50:54 +0000
Subject: Brought in the GUI Author: jgg Date: 1998-07-26 23:11:52 GMT Brought
 in the GUI

---
 buildlib/environment.mak.in | 5 +++--
 buildlib/library.mak        | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'buildlib')

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index cbc4ca0bb..3166c2e7f 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -9,8 +9,8 @@ CXXFLAGS+= @CXXFLAGS@ @X_CFLAGS@
 
 # Linker stuff
 PICFLAGS+= -fPIC -DPIC
-LFLAGS+= @LDFLAGS@ 
-XLIBS:=@X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@
+LFLAGS+= @LDFLAGS@
+XLIBS:=@X_LIBS@ @X_PRE_LIBS@ @X11LIB@ @X_EXTRA_LIBS@
 
 # Dep generation - this only works for gnu stuff
 INLINEDEPFLAG = -MD
@@ -23,3 +23,4 @@ DEBIANDOC_TEXT = @DEBIANDOC_TEXT@
 X11LIB = @X11LIB@
 GPMLIB = @GPMLIB@
 SLANGLIB = @SLANGLIB@
+XPMLIB = @XPMLIB@
diff --git a/buildlib/library.mak b/buildlib/library.mak
index 1b814875f..4ac3760dc 100644
--- a/buildlib/library.mak
+++ b/buildlib/library.mak
@@ -20,6 +20,7 @@ $(LOCAL)-OBJS := $(addprefix $(OBJ)/,$(addsuffix .opic,$(notdir $(basename $(SOU
 $(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .d,$(notdir $(basename $(SOURCE)))))
 $(LOCAL)-HEADERS := $(addprefix $(INCLUDE)/,$(HEADERS))
 $(LOCAL)-SONAME := lib$(LIBRARY).so.$(MAJOR)
+$(LOCAL)-SLIBS := $(SLIBS)
 
 # Install the command hooks
 headers: $($(LOCAL)-HEADERS)
@@ -45,7 +46,8 @@ $(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR)
 $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
 	echo Building shared library $@
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) -o $@ \
-	   -Wl,-soname -Wl,$($(@F)-SONAME) -shared $(filter %.opic,$^)
+	   -Wl,-soname -Wl,$($(@F)-SONAME) -shared $(filter %.opic,$^) \
+	   $($(@F)-SLIBS)
 
 # Compilation rules
 vpath %.cc $(SUBDIRS)
-- 
cgit v1.2.3