summaryrefslogtreecommitdiff
authorzecke <zecke>2004-02-07 21:32:30 (UTC)
committer zecke <zecke>2004-02-07 21:32:30 (UTC)
commit83a8f6fd9db949943d58d2f2a80304d516cf45d3 (patch) (side-by-side diff)
tree25cb30870bedec9e65cfa7cc0e876cdac5132cdd
parent9212a1715e5092ce143043770c5f2ff86db907ee (diff)
downloadopie-83a8f6fd9db949943d58d2f2a80304d516cf45d3.zip
opie-83a8f6fd9db949943d58d2f2a80304d516cf45d3.tar.gz
opie-83a8f6fd9db949943d58d2f2a80304d516cf45d3.tar.bz2
Fix up linking.
Only wlan currently requires Opie2 stuff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/networksettings.pro2
-rw-r--r--noncore/settings/networksettings/wlan/wlan.pro2
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/networksettings/networksettings.pro b/noncore/settings/networksettings/networksettings.pro
index 156a8dc..0615ea4 100644
--- a/noncore/settings/networksettings/networksettings.pro
+++ b/noncore/settings/networksettings/networksettings.pro
@@ -1,12 +1,12 @@
CONFIG = qt warn_on debug quick-app
HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h
SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp
INCLUDEPATH += $(OPIEDIR)/include interfaces/
DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan/ ppp/
-LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopie -lopiecore2 -lopienet2
+LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopie
INTERFACES = mainwindow.ui addconnection.ui
TARGET = networksettings
include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/wlan/wlan.pro b/noncore/settings/networksettings/wlan/wlan.pro
index 098ad1d..23384c1 100644
--- a/noncore/settings/networksettings/wlan/wlan.pro
+++ b/noncore/settings/networksettings/wlan/wlan.pro
@@ -1,28 +1,28 @@
#
TEMPLATE = lib
#TEMPLATE = app
CONFIG += qt plugin warn_on release
#CONFIG += qt plugin warn_on debug
DESTDIR = $(OPIEDIR)/plugins/networksettings
HEADERS = infoimp.h wlanmodule.h wextensions.h keyedit.h
SOURCES = infoimp.cpp wlanmodule.cpp wextensions.cpp keyedit.cpp
INCLUDEPATH += $(OPIEDIR)/include ../ ../interfaces/
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -L../interfaces/ -linterfaces -lopienet2
+LIBS += -lqpe -L../interfaces/ -linterfaces -lopiecore2 -lopienet2
INTERFACES = wlan.ui info.ui
TARGET = wlan
VERSION = 1.0.0
#CONFIG += wirelessopts
wirelessopts {
HEADERS += wlanimp.h
SOURCES += wlanimp.cpp
}
! wirelessopts {
HEADERS += wlanimp2.h
SOURCES += wlanimp2.cpp
}
include ( $(OPIEDIR)/include.pro )