diff options
| author | Michael Vogt <mvo@debian.org> | 2013-07-24 22:06:18 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-07-24 22:06:18 +0200 |
| commit | f39daeb1f66b8910f91274055bf07c3d008cdc50 (patch) | |
| tree | 9283950ebf8a3089b8b16b1d09c3aec8ecc5eb07 /buildlib/library.mak | |
| parent | 267275c59cc35704789a228c6e9b1464c4cabd74 (diff) | |
| parent | c7a629dd114c41a1244744e2f5085df2f505dc90 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid'
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) |