[cig-commits] r6898 - cs/cigma/trunk

[luis at geodynamics.org]

Author: luis
Date: 2007-05-16 10:20:33 -0700 (Wed, 16 May 2007)
New Revision: 6898

Modified:
   cs/cigma/trunk/Makefile
Log:
Changed top level makefile to build libutil in addition to libcigma


Modified: cs/cigma/trunk/Makefile
===================================================================
--- cs/cigma/trunk/Makefile	2007-05-16 17:19:21 UTC (rev 6897)
+++ cs/cigma/trunk/Makefile	2007-05-16 17:20:33 UTC (rev 6898)
@@ -10,7 +10,7 @@
 CFLAGS = -Wall $(OPTIMIZE) $(INCLUDES) $(LIBRARIES)
 
 
-OBJFILES = \
+LIBCIGMA_OBJS = \
 	src/dataset.o \
 	src/array.o \
 	src/mesh.o \
@@ -21,21 +21,30 @@
 	src/hex8.o \
 	src/field.o \
 	src/points.o \
+	src/cube.o \
 
+LIBUTIL_OBJS = \
+	util/split.o \
 
+
 TARGETS = \
 	lib/libcigma.a \
+	lib/libutil.a \
 
 
 all: $(TARGETS)
 
 
-lib/libcigma.a: $(OBJFILES)
+lib/libcigma.so: $(LIBCIGMA_OBJS)
+	$(LD) -fPIC -shared $(LIBS) $^ -o $@
+
+
+lib/libcigma.a: $(LIBCIGMA_OBJS)
 	ar rcs $@ $^
 
 
-lib/libcigma.so: $(OBJFILES)
-	$(LD) -fPIC -shared $(LIBS) $^ -o $@
+lib/libutil.a: $(LIBUTIL_OBJS)
+	ar rcs $@ $^
 
 
 .c.o:
@@ -43,7 +52,7 @@
 
 
 clean:
-	rm -f $(OBJFILES) $(TARGETS)
+	rm -f $(TARGETS) $(LIBCIGMA_OBJS) $(LIBUTIL_OBJS)
 
 
 .PHONY: clean