diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2013-07-02 16:53:45 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2013-07-02 16:53:45 +0200 |
| commit | 56363109dac51dffb6ec8491728e0bc934a15fa1 (patch) | |
| tree | 90db7c6af4ea25028df6c2731a57b0724fc3c626 /buildlib/library.mak | |
| parent | 3599bca5211077f5456a40adb5cec1bcbee8c3ae (diff) | |
| parent | 4b8528bd5749f759e924534709a620da67cd40f8 (diff) | |
merged debian/sid branch from git.debian.org
Diffstat (limited to 'buildlib/library.mak')
| -rw-r--r-- | buildlib/library.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildlib/library.mak b/buildlib/library.mak index 029e87463..ef1306b66 100644 --- a/buildlib/library.mak +++ b/buildlib/library.mak @@ -51,7 +51,7 @@ $(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR) ln -sf $(<F) $@ # The binary build rule -$(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) +$(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) $(LIBRARYDEPENDS) -rm -f $(LIB)/lib$($(@F)-LIBRARY)*.so* 2> /dev/null echo Building shared library $@ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\ @@ -61,7 +61,7 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) # Compilation rules vpath %.cc $(SUBDIRS) -$(OBJ)/%.opic: %.cc +$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) echo Compiling $< to $@ $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $< $(DoDep) |