CLEANUP: make networksettings directory structure packaging-friendly

11 files changed, 32 insertions, 3 deletions

diff --git a/noncore/settings/networksettings/mainwindow/.cvsignore b/noncore/settings/networksettings/mainwindow/.cvsignore
new file mode 100644
index 0000000..e000724
--- a/dev/null
+++ b/noncore/settings/networksettings/mainwindow/.cvsignore
@@ -0,0 +1,29 @@
+*.moc
+*.moc.o
+*.o
+.deps
+.libs
+.moc.cpp
+.moc.o
+.o
+Makefile*
+addconnection.cpp
+addconnection.h
+interfaceadvanced.cpp
+interfaceadvanced.h
+interfaceinformation.cpp
+interfaceinformation.h
+interfacesetup.cpp
+interfacesetup.h
+mainwindow.cpp
+mainwindow.h
+moc_*.cpp
+networksetup
+systemadvanced.cpp
+systemadvanced.h
+hosts.h
+hosts.cpp
+vpn.h
+vpn.cpp
+dns.h
+dns.cpp
diff --git a/noncore/settings/networksettings/addconnection.ui b/noncore/settings/networksettings/mainwindow/addconnection.ui
index da6cf06..da6cf06 100644
--- a/noncore/settings/networksettings/addconnection.ui
+++ b/noncore/settings/networksettings/mainwindow/addconnection.ui
diff --git a/noncore/settings/networksettings/addconnectionimp.cpp b/noncore/settings/networksettings/mainwindow/addconnectionimp.cpp
index f18d8d1..f18d8d1 100644
--- a/noncore/settings/networksettings/addconnectionimp.cpp
+++ b/noncore/settings/networksettings/mainwindow/addconnectionimp.cpp
diff --git a/noncore/settings/networksettings/addconnectionimp.h b/noncore/settings/networksettings/mainwindow/addconnectionimp.h
index 57e6b20..57e6b20 100644
--- a/noncore/settings/networksettings/addconnectionimp.h
+++ b/noncore/settings/networksettings/mainwindow/addconnectionimp.h
diff --git a/noncore/settings/networksettings/defaultmodule.h b/noncore/settings/networksettings/mainwindow/defaultmodule.h
index c7791d5..c7791d5 100644
--- a/noncore/settings/networksettings/defaultmodule.h
+++ b/noncore/settings/networksettings/mainwindow/defaultmodule.h
diff --git a/noncore/settings/networksettings/main.cpp b/noncore/settings/networksettings/mainwindow/main.cpp
index e4153c3..e4153c3 100644
--- a/noncore/settings/networksettings/main.cpp
+++ b/noncore/settings/networksettings/mainwindow/main.cpp
diff --git a/noncore/settings/networksettings/networksettings.pro b/noncore/settings/networksettings/mainwindow/mainwindow.pro
index 9ad9be4..460d4d7 100644
--- a/noncore/settings/networksettings/networksettings.pro
+++ b/noncore/settings/networksettings/mainwindow/mainwindow.pro
@@ -1,9 +1,9 @@
 CONFIG   = qt warn_on 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 -lopiecore2 -lopieui2
+INCLUDEPATH += $(OPIEDIR)/include ../interfaces/ .
+DEPENDPATH  += $(OPIEDIR)/include ../interfaces/ ../wlan/ ../ppp/
+LIBS        += -lqpe -L$(OPIEDIR)/plugins/networksettings -L../interfaces -linterfaces -lopiecore2 -lopieui2
 INTERFACES = mainwindow.ui addconnection.ui
 TARGET    = networksettings
 
diff --git a/noncore/settings/networksettings/mainwindow.ui b/noncore/settings/networksettings/mainwindow/mainwindow.ui
index a730dd5..a730dd5 100644
--- a/noncore/settings/networksettings/mainwindow.ui
+++ b/noncore/settings/networksettings/mainwindow/mainwindow.ui
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
index 5184630..5184630 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindow/mainwindowimp.h
index f211d6e..f211d6e 100644
--- a/noncore/settings/networksettings/mainwindowimp.h
+++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.h
diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/mainwindow/module.h
index 9dc913e..9dc913e 100644
--- a/noncore/settings/networksettings/module.h
+++ b/noncore/settings/networksettings/mainwindow/module.h