[swarm-cvs] [7949] fix directory structure for tests

[Scott Christley]

Revision: 7949
          http://svn.sv.gnu.org/viewvc/?view=rev&root=swarm&revision=7949
Author:   schristley
Date:     2013-01-17 21:26:19 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
fix directory structure for tests

Modified Paths:
--------------
    trunk/swarm/tests/ChangeLog
    trunk/swarm/tests/Makefile.rules
    trunk/swarm/tests/activity/ChangeLog
    trunk/swarm/tests/activity/tactivity.h

Modified: trunk/swarm/tests/ChangeLog
===================================================================
--- trunk/swarm/tests/ChangeLog 2013-01-17 21:06:15 UTC (rev 7948)
+++ trunk/swarm/tests/ChangeLog 2013-01-17 21:26:19 UTC (rev 7949)
@@ -1,3 +1,7 @@
+2013-01-17  Scott Christley  <address@hidden>
+
+       * Makefile.rules: Correct directory structure for module files.
+
 2009-11-24  Scott Christley  <address@hidden>
 
        * Makefile.rules: Use GNU sed. Create links to support building in

Modified: trunk/swarm/tests/Makefile.rules
===================================================================
--- trunk/swarm/tests/Makefile.rules    2013-01-17 21:06:15 UTC (rev 7948)
+++ trunk/swarm/tests/Makefile.rules    2013-01-17 21:26:19 UTC (rev 7949)
@@ -4,7 +4,7 @@
 
 SUFFIXES = .m
 
-TYPEINFO = $(MODULE).xm $(MODULE)/$(MODULE)_types.h 
$(MODULE)/$(MODULE)_classes.h
+TYPEINFO = $(MODULE).xm $(MODULE)_types.h $(MODULE)_classes.h
 
 CLEANFILES = $(TYPEINFO)
 
@@ -13,12 +13,11 @@
 swarm-link:
        -rm -f Swarm
        -rm -f $(srcdir)/Swarm
-       -$(LN_S) $(MODULE) Swarm
+       -$(LN_S) . Swarm
        -$(LN_S) . $(srcdir)/Swarm
 
 $(firstword $(TYPEINFO)): $(MODULE).h $(MAKEH2X) # $(SOURCES)
        OBJC="$(OBJC)" OBJCFLAGS="$(DEFS) $(INCLUDES) $(CPPFLAGS) $(OBJCFLAGS)" 
OBJECTS="$(patsubst %.m,%.o,$(filter-out %.h,$(type_SRCS)))" GSED="$(GSED)" sh 
$(MAKEH2X) $(MODULE).xm $(srcdir)
-       test -d $(MODULE) || mkdir $(MODULE)
-       mv $(MODULE).xt $(MODULE)/$(MODULE)_types.h
-       mv $(MODULE).xc $(MODULE)/$(MODULE)_classes.h
+       mv $(MODULE).xt $(MODULE)_types.h
+       mv $(MODULE).xc $(MODULE)_classes.h
 

Modified: trunk/swarm/tests/activity/ChangeLog
===================================================================
--- trunk/swarm/tests/activity/ChangeLog        2013-01-17 21:06:15 UTC (rev 
7948)
+++ trunk/swarm/tests/activity/ChangeLog        2013-01-17 21:26:19 UTC (rev 
7949)
@@ -1,3 +1,7 @@
+2013-01-17  Scott Christley  <address@hidden>
+
+       * tactivity.h: New directory structure.
+
 2009-09-24  Scott Christley  <address@hidden>
 
        * tactivity.h: Adjust casts to eliminate compiler warnings.

Modified: trunk/swarm/tests/activity/tactivity.h
===================================================================
--- trunk/swarm/tests/activity/tactivity.h      2013-01-17 21:06:15 UTC (rev 
7948)
+++ trunk/swarm/tests/activity/tactivity.h      2013-01-17 21:26:19 UTC (rev 
7949)
@@ -17,4 +17,4 @@
 @protocol ConcurrentGroup_test <Group_test, ConcurrentGroup, CREATABLE>
 @end
 
-#import <tactivity/tactivity_types.h>
+#import <Swarm/tactivity_types.h>