$(TOPDIR), make, scripts: Merged changes of V_1_1_5-2 -> V_1_1_5-2F3

This commit is contained in:
Jan Lindemann 2004-09-04 19:46:32 +00:00 committed by Jan Lindemann
commit aa4bc767d9
6 changed files with 39 additions and 7 deletions

View file

@ -155,6 +155,8 @@ else
QT_PREFIX = /usr/lib/qt2
endif
LD_LIB_PATH += $(QT_PREFIX)/lib
MOC = $(QT_PREFIX)/bin/moc
UIC = $(QT_PREFIX)/bin/uic
@ -195,8 +197,8 @@ LDFLAGS += -fprofile-arcs -ftest-coverage
endif
ifeq ($(USE_MPATROL),true)
PROJECT_CFLAGS += -include $(MODDIR)/include/mpatrol.h
#PROJECT_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h
PROJECT_CFLAGS += -include /usr/include/mpatrol.h
#PROJECT_CPPFLAGS += -include /usr/include/mpatrol.h
PROJECT_LDFLAGS += -lmpatrolmt -lbfd -liberty
endif