[PC-BSD Commits] r7826 - in pcbsd/current: src-qt4 src-sh src-sh/pc-su src-sh/pc-xdgutil

[svn at pcbsd.org]

Author: kris
Date: 2010-10-14 11:14:47 -0700 (Thu, 14 Oct 2010)
New Revision: 7826

Added:
   pcbsd/current/src-sh/pc-xdgutil/
   pcbsd/current/src-sh/pc-xdgutil/Makefile
Removed:
   pcbsd/current/src-qt4/pc-xdgutil/
   pcbsd/current/src-sh/pc-xdgutil/pc-xdgutil.pro
Modified:
   pcbsd/current/src-qt4/src-qt4.pro
   pcbsd/current/src-sh/Makefile
   pcbsd/current/src-sh/pc-su/Makefile
Log:

Moved pc-xdgutil -> src-sh/pc-xdgutil and cleanup build



Modified: pcbsd/current/src-qt4/src-qt4.pro
===================================================================
--- pcbsd/current/src-qt4/src-qt4.pro	2010-10-14 17:36:38 UTC (rev 7825)
+++ pcbsd/current/src-qt4/src-qt4.pro	2010-10-14 18:14:47 UTC (rev 7826)
@@ -17,5 +17,4 @@
 	 pc-sysmanager \
 	 pc-systemupdatertray \
 	 pc-usermanager \
-	 pc-xdgutil \
 	 pc-xgui

Modified: pcbsd/current/src-sh/Makefile
===================================================================
--- pcbsd/current/src-sh/Makefile	2010-10-14 17:36:38 UTC (rev 7825)
+++ pcbsd/current/src-sh/Makefile	2010-10-14 18:14:47 UTC (rev 7826)
@@ -22,8 +22,22 @@
 SUBTARGETS    =  \
 		sub-pcsu \
 		sub-pbi \
-		sub-meta
+		sub-meta \
+		sub-xdgutil
 
+sub-xdgutil: pc-xdgutil/$(MAKEFILE) FORCE
+	cd pc-xdgutil/ && $(MAKE) -f $(MAKEFILE)
+sub-xdgutil-make_default: pc-xdgutil/$(MAKEFILE) FORCE
+	cd pc-xdgutil/ && $(MAKE) -f $(MAKEFILE) 
+sub-xdgutil-make_first: pc-xdgutil/$(MAKEFILE) FORCE
+	cd pc-xdgutil/ && $(MAKE) -f $(MAKEFILE) first
+sub-xdgutil-all: pc-xdgutil/$(MAKEFILE) FORCE
+	cd pc-xdgutil/ && $(MAKE) -f $(MAKEFILE) all
+sub-xdgutil-clean: pc-xdgutil/$(MAKEFILE) FORCE
+	cd pc-xdgutil/ && $(MAKE) -f $(MAKEFILE) clean
+sub-xdgutil-install_subtargets: pc-xdgutil/$(MAKEFILE) FORCE
+	cd pc-xdgutil/ && $(MAKE) -f $(MAKEFILE) install
+
 sub-pcsu: pc-su/$(MAKEFILE) FORCE
 	cd pc-su/ && $(MAKE) -f $(MAKEFILE)
 sub-pcsu-make_default: pc-su/$(MAKEFILE) FORCE
@@ -63,11 +77,36 @@
 sub-meta-install_subtargets: pc-metapkgmanager/$(MAKEFILE) FORCE
 	cd pc-metapkgmanager/ && $(MAKE) -f $(MAKEFILE) install
 
-make_default: sub-pbi-make_default sub-meta-make_default sub-pcsu-make_default FORCE
-make_first: sub-pbi-make_first sub-meta-make_first sub-pcsu-make_first FORCE
-all: sub-pbi-all sub-meta-all sub-pcsu-all FORCE
-clean: sub-pbi-clean sub-meta-clean sub-pcsu-clean FORCE
-install_subtargets: sub-pbi-install_subtargets sub-meta-install_subtargets sub-pcsu-install_subtargets FORCE
+make_default: sub-pbi-make_default \
+	sub-meta-make_default \
+	sub-pcsu-make_default \
+	sub-xdgutil-make_default \
+	FORCE
+
+make_first: sub-pbi-make_first \
+	sub-meta-make_first \
+	sub-pcsu-make_first \
+	sub-xdgutil-make_first \
+	FORCE
+
+all: sub-pbi-all \
+	sub-meta-all \
+	sub-pcsu-all \
+	sub-xdgutil-all \
+	FORCE
+
+clean: sub-pbi-clean \
+	sub-meta-clean \
+	sub-pcsu-clean \
+	sub-xdgutil-clean \
+	FORCE
+
+install_subtargets: sub-pbi-install_subtargets \
+	sub-meta-install_subtargets \
+	sub-pcsu-install_subtargets \
+	sub-xdgutil-install_subtargets \
+	FORCE
+
 install: install_subtargets FORCE
 
 FORCE:

Modified: pcbsd/current/src-sh/pc-su/Makefile
===================================================================
--- pcbsd/current/src-sh/pc-su/Makefile	2010-10-14 17:36:38 UTC (rev 7825)
+++ pcbsd/current/src-sh/pc-su/Makefile	2010-10-14 18:14:47 UTC (rev 7826)
@@ -32,7 +32,7 @@
 
 install_scripts: first FORCE
 	@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/ 
-	-$(INSTALL_FILE) /usr/home/kris/source/pcbsd/current/src-qt4/pc-su/pc-su $(INSTALL_ROOT)/usr/local/bin/
+	-$(INSTALL_FILE) pc-su $(INSTALL_ROOT)/usr/local/bin/
 
 
 uninstall_scripts:  FORCE