summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/networksetup.pro5
-rw-r--r--noncore/net/networksetup/wlan/wlan.pro (renamed from noncore/net/networksetup/wlan/wlansetup.pro)2
-rw-r--r--noncore/settings/networksettings/networksetup.pro5
-rw-r--r--noncore/settings/networksettings/wlan/wlan.pro (renamed from noncore/settings/networksettings/wlan/wlansetup.pro)2
4 files changed, 8 insertions, 6 deletions
diff --git a/noncore/net/networksetup/networksetup.pro b/noncore/net/networksetup/networksetup.pro
index ba70180..f09db93 100644
--- a/noncore/net/networksetup/networksetup.pro
+++ b/noncore/net/networksetup/networksetup.pro
@@ -1,10 +1,11 @@
+DESTDIR = $(OPIEDIR)/bin
TEMPLATE = app
#CONFIG = qt warn_on debug
CONFIG = qt warn_on release
HEADERS = mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h
SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
-#INCLUDEPATH += $(QPEDIR)/include
-#DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES = mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui
TARGET = networksetup
diff --git a/noncore/net/networksetup/wlan/wlansetup.pro b/noncore/net/networksetup/wlan/wlan.pro
index 7102adb..d8f9a0d 100644
--- a/noncore/net/networksetup/wlan/wlansetup.pro
+++ b/noncore/net/networksetup/wlan/wlan.pro
@@ -1,12 +1,12 @@
TEMPLATE = lib
CONFIG += qt warn_on release
#CONFIG += qt warn_on debug
-#DESTDIR = $(OPIEDIR)/bin
+DESTDIR = $(OPIEDIR)/plugins/.networksetup
HEADERS = wlanimp.h wlanmodule.h
SOURCES = wlanimp.cpp wlanmodule.cpp
INCLUDEPATH += $(OPIEDIR)/include ../
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES = wlan.ui
TARGET = wlanplugin
VERSION = 1.0.0
diff --git a/noncore/settings/networksettings/networksetup.pro b/noncore/settings/networksettings/networksetup.pro
index ba70180..f09db93 100644
--- a/noncore/settings/networksettings/networksetup.pro
+++ b/noncore/settings/networksettings/networksetup.pro
@@ -1,10 +1,11 @@
+DESTDIR = $(OPIEDIR)/bin
TEMPLATE = app
#CONFIG = qt warn_on debug
CONFIG = qt warn_on release
HEADERS = mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h
SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
-#INCLUDEPATH += $(QPEDIR)/include
-#DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES = mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui
TARGET = networksetup
diff --git a/noncore/settings/networksettings/wlan/wlansetup.pro b/noncore/settings/networksettings/wlan/wlan.pro
index 7102adb..d8f9a0d 100644
--- a/noncore/settings/networksettings/wlan/wlansetup.pro
+++ b/noncore/settings/networksettings/wlan/wlan.pro
@@ -1,12 +1,12 @@
TEMPLATE = lib
CONFIG += qt warn_on release
#CONFIG += qt warn_on debug
-#DESTDIR = $(OPIEDIR)/bin
+DESTDIR = $(OPIEDIR)/plugins/.networksetup
HEADERS = wlanimp.h wlanmodule.h
SOURCES = wlanimp.cpp wlanmodule.cpp
INCLUDEPATH += $(OPIEDIR)/include ../
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES = wlan.ui
TARGET = wlanplugin
VERSION = 1.0.0