diff --git a/make/defs.mk b/make/defs.mk index 3410cbc5..eb83bd99 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -1,4 +1,3 @@ - # (c) 2001 jannet it services # contact@jannet.de # $Id$ @@ -42,10 +41,12 @@ MKFILES = $(wildcard *.mk) CFILES = $(wildcard *.c) CPPFILES = $(wildcard *.cc *.cpp) +SFILES = $(wildcard *.S) UIFILES = $(wildcard *.ui) RCCFILES = $(wildcard *.qrc) CALLSRC = $(CFILES) $(CPPFILES) OBJ = $(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(CALLSRC)))) +OBJ += $(patsubst %.S,%.o,$(SFILES)) SHOBJS = $(patsubst %.cpp,lib%.so,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(CALLSRC)))) SHSCRIPTS = $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl)) SCRIPTS = $(patsubst %.tmpl,%,$(wildcard *.tmpl)) @@ -191,7 +192,7 @@ else ifneq ($(QT_VERSION),4) LPPFLAGS += -L$(QT_PREFIX)/lib -lqt else - LPPFLAGS += -L$(QT_PREFIX)/lib -lQtGui_debug -lQtCore_debug + LPPFLAGS += -L$(QT_PREFIX)/lib -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug endif endif