[csw-devel] SF.net SVN: gar:[2365] csw/mgar/gar/v2

[dmichelsen at users.sourceforge.net]

Revision: 2365
          http://gar.svn.sourceforge.net/gar/?rev=2365&view=rev
Author:   dmichelsen
Date:     2008-11-26 16:15:26 +0000 (Wed, 26 Nov 2008)

Log Message:
-----------
GARv2: Make directory adjustments

Modified Paths:
--------------
    csw/mgar/gar/v2/category.mk
    csw/mgar/gar/v2/gar.mk

Modified: csw/mgar/gar/v2/category.mk
===================================================================
--- csw/mgar/gar/v2/category.mk	2008-11-26 16:11:23 UTC (rev 2364)
+++ csw/mgar/gar/v2/category.mk	2008-11-26 16:15:26 UTC (rev 2365)
@@ -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/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2008-11-26 16:11:23 UTC (rev 2364)
+++ csw/mgar/gar/v2/gar.mk	2008-11-26 16:15:26 UTC (rev 2365)
@@ -21,7 +21,7 @@
 #GARDIR := $(CURDIR)/../..
 #endif
 
-GARDIR ?= ../..
+GARDIR ?= gar
 GARBIN  = $(GARDIR)/bin
 
 DIRSTODOTS = $(subst . /,./,$(patsubst %,/..,$(subst /, ,/$(1))))


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