diff options
Diffstat (limited to 'buildlib')
-rw-r--r-- | buildlib/defaults.mak | 4 | ||||
-rw-r--r-- | buildlib/program.mak | 2 |
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) |