[cig-commits] r7508 - in cs/cigma/branches/cigma-0.9: build src

[luis at geodynamics.org]

Author: luis
Date: 2007-06-26 09:57:01 -0700 (Tue, 26 Jun 2007)
New Revision: 7508

Added:
   cs/cigma/branches/cigma-0.9/src/cdecl.h
Modified:
   cs/cigma/branches/cigma-0.9/build/Makefile
Log:
darcs patches:
  * Template header for declaring C functions in C++
  * Updated template header file cdecl.h
  * Updated makefile to build hash.o


Modified: cs/cigma/branches/cigma-0.9/build/Makefile
===================================================================
--- cs/cigma/branches/cigma-0.9/build/Makefile	2007-06-26 16:55:35 UTC (rev 7507)
+++ cs/cigma/branches/cigma-0.9/build/Makefile	2007-06-26 16:57:01 UTC (rev 7508)
@@ -51,7 +51,11 @@
 	$(CIGMA)/src/tet4.o \
 	$(CIGMA)/src/hex8.o
 
+EXTOBJS = \
+	$(CIGMA)/src/hash.o
 
+ALLOBJS = $(OBJS) $(ELTOBJS) $(EXTOBJS)
+
 ###############################################################################
 
 all: $(TARGETS)
@@ -59,15 +63,15 @@
 cigma: $(CIGMA)/bin/cigma.c libcigma.a libcigma.so
 	$(CC) $(LDFLAGS) -lcigma -lhdf5 $< -o $@
 
-libcigma.a: $(OBJS) $(ELTOBJS)
+libcigma.a: $(ALLOBJS)
 	ar rcs $@ $^
 
-libcigma.so: $(OBJS) $(ELTOBJS)
+libcigma.so: $(ALLOBJS)
 	$(LD) -shared $(LDFLAGS) -o $@ $^
 
 
-$(CIGMA)/src/hash.o: $(CIGMA)/ext/hash/hash.c
-	$(CC) -c $< -o $@
+$(CIGMA)/src/hash.o: $(CIGMA)/src/hash.c
+	$(CC) -Wall -c $< -o $@
 
 $(CIGMA)/src/sqlite3.o: $(CIGMA)/ext/sqlite3/sqlite3.c
 	$(CC) -c $< -o $@

Added: cs/cigma/branches/cigma-0.9/src/cdecl.h
===================================================================
--- cs/cigma/branches/cigma-0.9/src/cdecl.h	2007-06-26 16:55:35 UTC (rev 7507)
+++ cs/cigma/branches/cigma-0.9/src/cdecl.h	2007-06-26 16:57:01 UTC (rev 7508)
@@ -0,0 +1,11 @@
+#ifndef __CIGMA_FOO_H__
+#define __CIGMA_FOO_H__
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __CIGMA_FOO_H__ */