[csw-devel] SF.net SVN: gar:[2344] csw/mgar/gar/v1

[dmichelsen at users.sourceforge.net]

Revision: 2344
          http://gar.svn.sourceforge.net/gar/?rev=2344&view=rev
Author:   dmichelsen
Date:     2008-11-23 19:32:01 +0000 (Sun, 23 Nov 2008)

Log Message:
-----------
mgar: Categories restructuring

Modified Paths:
--------------
    csw/mgar/gar/v1/categories/apps/category.mk
    csw/mgar/gar/v1/categories/cpan/category.mk
    csw/mgar/gar/v1/categories/devel/category.mk
    csw/mgar/gar/v1/categories/gnome/category.mk
    csw/mgar/gar/v1/categories/kde/category.mk
    csw/mgar/gar/v1/categories/lang/category.mk
    csw/mgar/gar/v1/categories/lib/category.mk
    csw/mgar/gar/v1/categories/meta/category.mk
    csw/mgar/gar/v1/categories/net/category.mk
    csw/mgar/gar/v1/categories/server/category.mk
    csw/mgar/gar/v1/categories/utils/category.mk
    csw/mgar/gar/v1/categories/xfce/category.mk
    csw/mgar/gar/v1/categories/xorg/category.mk
    csw/mgar/gar/v1/categories/xtra/category.mk
    csw/mgar/gar/v1/category.mk
    csw/mgar/gar/v1/gar.mk

Modified: csw/mgar/gar/v1/categories/apps/category.mk
===================================================================
--- csw/mgar/gar/v1/categories/apps/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/categories/apps/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -1 +1 @@
-include ../../gar.mk
+include gar/gar.mk

Modified: csw/mgar/gar/v1/categories/cpan/category.mk
===================================================================
--- csw/mgar/gar/v1/categories/cpan/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/categories/cpan/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -30,7 +30,7 @@
 
 _PREREQUISITE_BASE_PKGS += CSWperl
 
-include ../../gar.mk
+include gar/gar.mk
 
 # Canned commands for finding packlist files
 find_packlist = $(shell find $(1) -type f -name .packlist | head -1)

Modified: csw/mgar/gar/v1/categories/devel/category.mk
===================================================================
--- csw/mgar/gar/v1/categories/devel/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/categories/devel/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -1 +1 @@
-include ../../gar.mk
+include gar/gar.mk

Modified: csw/mgar/gar/v1/categories/gnome/category.mk
===================================================================
--- csw/mgar/gar/v1/categories/gnome/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/categories/gnome/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -1 +1 @@
-include ../../gar.mk
+include gar/gar.mk

Modified: csw/mgar/gar/v1/categories/kde/category.mk
===================================================================
--- csw/mgar/gar/v1/categories/kde/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/categories/kde/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -13,4 +13,4 @@
 # Compiler
 GARCOMPILER = GNU
 
-include ../../gar.mk
+include gar/gar.mk

Modified: csw/mgar/gar/v1/categories/lang/category.mk
===================================================================
--- csw/mgar/gar/v1/categories/lang/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/categories/lang/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -1 +1 @@
-include ../../gar.mk
+include gar/gar.mk

Modified: csw/mgar/gar/v1/categories/lib/category.mk
===================================================================
--- csw/mgar/gar/v1/categories/lib/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/categories/lib/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -1 +1 @@
-include ../../gar.mk
+include gar/gar.mk

Modified: csw/mgar/gar/v1/categories/meta/category.mk
===================================================================
--- csw/mgar/gar/v1/categories/meta/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/categories/meta/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -4,5 +4,5 @@
 TEST_SCRIPTS ?=
 INSTALL_SCRIPTS ?=
 
-include ../../gar.mk
+include gar/gar.mk
 

Modified: csw/mgar/gar/v1/categories/net/category.mk
===================================================================
--- csw/mgar/gar/v1/categories/net/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/categories/net/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -1 +1 @@
-include ../../gar.mk
+include gar/gar.mk

Modified: csw/mgar/gar/v1/categories/server/category.mk
===================================================================
--- csw/mgar/gar/v1/categories/server/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/categories/server/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -1 +1 @@
-include ../../gar.mk
+include gar/gar.mk

Modified: csw/mgar/gar/v1/categories/utils/category.mk
===================================================================
--- csw/mgar/gar/v1/categories/utils/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/categories/utils/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -1 +1 @@
-include ../../gar.mk
+include gar/gar.mk

Modified: csw/mgar/gar/v1/categories/xfce/category.mk
===================================================================
--- csw/mgar/gar/v1/categories/xfce/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/categories/xfce/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -9,7 +9,7 @@
 PKGDIST      ?= $(GARNAME)-$(GARVERSION).tar.bz2
 DISTFILES    += $(PKGDIST)
 
-include ../../gar.mk
+include gar/gar.mk
 
 # Compiler options
 # Compiler options

Modified: csw/mgar/gar/v1/categories/xorg/category.mk
===================================================================
--- csw/mgar/gar/v1/categories/xorg/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/categories/xorg/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -1 +1 @@
-include ../../gar.mk
+include gar/gar.mk

Modified: csw/mgar/gar/v1/categories/xtra/category.mk
===================================================================
--- csw/mgar/gar/v1/categories/xtra/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/categories/xtra/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -1 +1 @@
-include ../../gar.mk
+include gar/gar.mk

Modified: csw/mgar/gar/v1/category.mk
===================================================================
--- csw/mgar/gar/v1/category.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/category.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -1,19 +1,9 @@
 # vim: ft=make ts=4 sw=4 noet
 # This makefile is to be included from Makefiles in each category
 # directory.
-%:
-	@for i in $(filter-out CVS/,$(wildcard */)) ; do \
-		$(MAKE) -C $$i $* ; \
-	done
 
-paranoid-%:
-	@for i in $(filter-out CVS/,$(wildcard */)) ; do \
-		$(MAKE) -C $$i $* || exit 2; \
-	done
+ifeq (,$(CATEGORIES))
+  $(error Please set CATEGORIES to one of $(wildcard categories/*))
+endif
 
-export BUILDLOG ?= $(shell pwd)/buildlog.txt
-
-report-%:
-	@for i in $(filter-out CVS/,$(wildcard */)) ; do \
-		$(MAKE) -C $$i $* || echo "	*** make $* in $$i failed ***" >> $(BUILDLOG); \
-	done
+include gar/categories/$(CATEGORIES)/category.mk

Modified: csw/mgar/gar/v1/gar.mk
===================================================================
--- csw/mgar/gar/v1/gar.mk	2008-11-23 15:53:04 UTC (rev 2343)
+++ csw/mgar/gar/v1/gar.mk	2008-11-23 19:32:01 UTC (rev 2344)
@@ -16,7 +16,7 @@
 #GARDIR := $(CURDIR)/../..
 #endif
 
-GARDIR ?= ../..
+GARDIR ?= gar
 GARBIN  = $(GARDIR)/bin
 FILEDIR ?= files
 DOWNLOADDIR ?= download


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.