summaryrefslogtreecommitdiff
path: root/buildlib
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:52:03 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:52:03 +0000
commitc1a2237722820dcd5e387dda5a88085cf62e68b9 (patch)
treed8767f5498575b70bf6bacdbe962c776f6b84bb2 /buildlib
parentf826cfaa1c3f9fcf492fb65b22a2d964e78ae7ec (diff)
Optimizations
Author: jgg Date: 1998-12-07 07:26:19 GMT Optimizations
Diffstat (limited to 'buildlib')
-rw-r--r--buildlib/defaults.mak4
-rw-r--r--buildlib/program.mak2
2 files changed, 5 insertions, 1 deletions
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index f46e6156c..25512d249 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -69,6 +69,10 @@ ifdef STATICLIBS
LIBRARY_H += $(BASE)/buildlib/staticlibrary.mak
endif
+ifdef ONLYSTATICLIBS
+LIBRARY_H = $(BASE)/buildlib/staticlibrary.mak
+endif
+
# Source location control
# SUBDIRS specifies sub components of the module that
# may be located in subdrictories of the source dir.
diff --git a/buildlib/program.mak b/buildlib/program.mak
index 792c7d522..7c065da1a 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) $($(LOCAL)-SLIBS) -o $@ $(filter %.o,$^)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $(filter %.o,$^) $($(LOCAL)-SLIBS)
# Compilation rules
vpath %.cc $(SUBDIRS)