diff options
author | Michael Vogt <mvo@debian.org> | 2014-04-25 13:51:50 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-04-25 13:51:50 +0200 |
commit | 15ccc2a685b0b884b393e356f9960e86f97f532d (patch) | |
tree | 920a1fcf6fa2c92a05d0d1d2ccb22eb32b88522e /buildlib/library.mak | |
parent | a40c6649b99814c7d30964accdd5ecc4f1ce369a (diff) | |
parent | 506ab3c78fb67f5e452a1748f4870af767de5ebb (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'buildlib/library.mak')
-rw-r--r-- | buildlib/library.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/buildlib/library.mak b/buildlib/library.mak index ef1306b66..cc0286d7e 100644 --- a/buildlib/library.mak +++ b/buildlib/library.mak @@ -63,7 +63,7 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) vpath %.cc $(SUBDIRS) $(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) echo Compiling $< to $@ - $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $< + $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $(abspath $<) $(DoDep) # Include the dependencies that are available |