preparations for the standalone x11 build

1 files changed, 4 insertions, 7 deletions

diff --git a/noncore/net/wellenreiter/lib/lib.pro b/noncore/net/wellenreiter/lib/lib.pro
index 8728323..e36db11 100644
--- a/noncore/net/wellenreiter/lib/lib.pro
+++ b/noncore/net/wellenreiter/lib/lib.pro
@@ -1,28 +1,25 @@
 MOC_DIR         = ./tmp
 OBJECTS_DIR     = ./tmp
-DESTDIR         = $(OPIEDIR)/lib
+DESTDIR         = $(OPIEDIR)/output/lib
 TEMPLATE        = lib
 CONFIG          = qt warn_on debug
 
 HEADERS         = $(OPIEDIR)/libopie2/opieui/olistview.h \
                   $(OPIEDIR)/libopie2/opienet/onetutils.h \
+                  $(OPIEDIR)/libopie2/opienet/omanufacturerdb.h \
                   $(OPIEDIR)/libopie2/opienet/onetwork.h \
                   $(OPIEDIR)/libopie2/opienet/opcap.h
 
 SOURCES         = $(OPIEDIR)/libopie2/opieui/olistview.cpp \
                   $(OPIEDIR)/libopie2/opienet/onetutils.cpp \
+                  $(OPIEDIR)/libopie2/opienet/omanufacturerdb.cpp \
                   $(OPIEDIR)/libopie2/opienet/onetwork.cpp \
                   $(OPIEDIR)/libopie2/opienet/opcap.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-LIBS            = -lpcap
+LIBS            = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lpcap
 TARGET          = wellenreiter
 VERSION         = 1.0.0
 
-contains( platform, x11 ) {
-  LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
-  SOURCES += resource.cpp
-  HEADERS += resource.h
-}