[PC-BSD Commits] r7684 - in pcbsd/current: . src-qt4 src-qt4/libpcbsd src-qt4/pc-netmanager/src/NetworkManager src-qt4/pc-netmanager/src/NetworkTray src-qt4/pc-netmanager/src/ethernetconfig src-qt4/pc-netmanager/src/wificonfig

[svn at pcbsd.org]

Author: kris
Date: 2010-10-01 07:15:01 -0700 (Fri, 01 Oct 2010)
New Revision: 7684

Added:
   pcbsd/current/src-qt4/libpcbsd/
   pcbsd/current/src-qt4/libpcbsd/libpcbsd.pro
Removed:
   pcbsd/current/libpcbsd/
   pcbsd/current/src-qt4/libpcbsd/CMakeLists.txt
Modified:
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.pro
   pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.pro
   pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfig.pro
   pcbsd/current/src-qt4/src-qt4.pro
Log:

Move libpcbsd into src-qt4, and switch it to use qmake, fix networking programs
to also compile with includepath



Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro	2010-10-01 09:04:21 UTC (rev 7683)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro	2010-10-01 14:15:01 UTC (rev 7684)
@@ -85,4 +85,6 @@
 dotrans.path=/usr/local/share/pcbsd/i18n/
 dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
-INSTALLS+= dotrans target
+INSTALLS+= dotrans
+
+INCLUDEPATH+= ../../../libpcbsd/

Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.pro
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.pro	2010-10-01 09:04:21 UTC (rev 7683)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.pro	2010-10-01 14:15:01 UTC (rev 7684)
@@ -79,3 +79,5 @@
 
 TARGET  = pc-nettray
 target.path = /usr/local/bin/
+
+INCLUDEPATH+= ../../../libpcbsd/

Modified: pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.pro
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.pro	2010-10-01 09:04:21 UTC (rev 7683)
+++ pcbsd/current/src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.pro	2010-10-01 14:15:01 UTC (rev 7684)
@@ -84,3 +84,5 @@
 
 TARGET  = pc-ethernetconfig
 target.path = /usr/local/bin
+
+INCLUDEPATH+= ../../../libpcbsd/

Modified: pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfig.pro
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfig.pro	2010-10-01 09:04:21 UTC (rev 7683)
+++ pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfig.pro	2010-10-01 14:15:01 UTC (rev 7684)
@@ -84,3 +84,5 @@
 
 TARGET  = pc-wificonfig
 target.path = /usr/local/bin
+
+INCLUDEPATH+= ../../../libpcbsd/

Modified: pcbsd/current/src-qt4/src-qt4.pro
===================================================================
--- pcbsd/current/src-qt4/src-qt4.pro	2010-10-01 09:04:21 UTC (rev 7683)
+++ pcbsd/current/src-qt4/src-qt4.pro	2010-10-01 14:15:01 UTC (rev 7684)
@@ -1,6 +1,7 @@
 TEMPLATE = subdirs
 
-SUBDIRS+= life-preserver \
+SUBDIRS+= libpcbsd \
+	 life-preserver \
 	 pbi-manager \
 	 pbreg \
 	 pc-controlpanel \