[cig-commits] r7511 - in cs/cigma/branches/cigma-0.9: . build src
luis at geodynamics.org
luis at geodynamics.org
Tue Jun 26 10:01:45 PDT 2007
Author: luis
Date: 2007-06-26 10:01:45 -0700 (Tue, 26 Jun 2007)
New Revision: 7511
Added:
cs/cigma/branches/cigma-0.9/m4/
cs/cigma/branches/cigma-0.9/src/README
Modified:
cs/cigma/branches/cigma-0.9/build/Makefile
cs/cigma/branches/cigma-0.9/configure.ac
cs/cigma/branches/cigma-0.9/src/Makefile.am
cs/cigma/branches/cigma-0.9/src/arg_dbl.c
cs/cigma/branches/cigma-0.9/src/arg_file.c
cs/cigma/branches/cigma-0.9/src/arg_lit.c
cs/cigma/branches/cigma-0.9/src/arg_str.c
cs/cigma/branches/cigma-0.9/src/argtable2.c
Log:
darcs patches:
* Changed makefile rule 'clean' to delete all object files
* Changed makefile to build argtable2.o
* Added macro directory (m4)
* Updated configure.ac (see corresponding file for argtable2)
* Make sure standard headers are included in each arg_*.c files
Note: temporary measure while we get the configure script to generate
the appropriate src/config.h header file.
* Added acknowledgements section to src/README
* Tentative change to src/Makefile.am
* Make sure standard headers are included in argtable2.c
Note: need to generate src/config.h
* Fixed build rule for argtable2.o
Modified: cs/cigma/branches/cigma-0.9/build/Makefile
===================================================================
--- cs/cigma/branches/cigma-0.9/build/Makefile 2007-06-26 16:59:15 UTC (rev 7510)
+++ cs/cigma/branches/cigma-0.9/build/Makefile 2007-06-26 17:01:45 UTC (rev 7511)
@@ -53,12 +53,23 @@
$(CIGMA)/src/tet4.o \
$(CIGMA)/src/hex8.o
+ARGOBJS = \
+ $(CIGMA)/src/argtable2.o \
+ $(CIGMA)/src/arg_end.o \
+ $(CIGMA)/src/arg_rem.o \
+ $(CIGMA)/src/arg_lit.o \
+ $(CIGMA)/src/arg_str.o \
+ $(CIGMA)/src/arg_int.o \
+ $(CIGMA)/src/arg_dbl.o \
+ $(CIGMA)/src/arg_file.o
+
EXTOBJS = \
$(CIGMA)/src/hash.o \
$(CIGMA)/src/sqlite3.o
-ALLOBJS = $(OBJS) $(ELTOBJS) $(EXTOBJS)
+ALLOBJS = $(OBJS) $(ELTOBJS) $(ARGOBJS) $(EXTOBJS)
+
###############################################################################
all: $(TARGETS)
@@ -79,6 +90,9 @@
$(CIGMA)/src/sqlite3.o: $(CIGMA)/src/sqlite3.c
$(CC) -c $< -o $@
+$(CIGMA)/src/argtable2.o: $(CIGMA)/src/argtable2.c $(ARGOBJS)
+ $(CC) $(CFLAGS) -c $< -o $@
+
$(CIGMA)/benchmarks/disloc3d/dc3d.o: $(CIGMA)/fields/disloc3d/dc3d.f
$(FC) -c $< -o $@
@@ -86,7 +100,7 @@
$(CC) $(CFLAGS) -c $< -o $@
clean:
- rm -f $(OBJS)
+ rm -f $(ALLOBJS)
clean-all: clean
rm -f $(TARGETS)
Modified: cs/cigma/branches/cigma-0.9/configure.ac
===================================================================
--- cs/cigma/branches/cigma-0.9/configure.ac 2007-06-26 16:59:15 UTC (rev 7510)
+++ cs/cigma/branches/cigma-0.9/configure.ac 2007-06-26 17:01:45 UTC (rev 7511)
@@ -6,10 +6,12 @@
AC_INIT([cigma], 0.9.0, [cig-cs at geodynamics.org])
AC_MSG_NOTICE([Configuring cigma-]AC_PACKAGE_VERSION)
AC_CONFIG_AUX_DIR([./aux-config])
-AC_CONFIG_HEADER([include/cigma/config.h])
-#AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_SRCDIR([src/fe.h])
+AM_CONFIG_HEADER([src/config.h])
+
# configure options
@@ -27,6 +29,7 @@
AC_PROG_FC([gfortran])
AC_PROG_LIBTOOL
AC_PROG_INSTALL
+AC_PROG_MAKE_SET
# Checks for libraries.
@@ -51,6 +54,12 @@
AC_FUNC_STRFTIME
AC_FUNC_STRTOD
AC_CHECK_FUNCS([bzero strchr strcspn strrchr strtol])
+#AC_CHECK_FUNC(getopt_long, SYS_GETOPTLONG=1, SYS_GETOPTLONG=0)
+#AC_CHECK_FUNC(regcomp, SYS_REGEX=1, SYS_REGEX=0)
+#AC_CHECK_FUNC(strptime, SYS_STRPTIME=1, SYS_STRPTIME=0)
+#AM_CONDITIONAL(USE_SYS_GETOPTLONG, test "$SYS_GETOPTLONG" = "1")
+#AM_CONDITIONAL(USE_ARGREX, test "$SYS_REGEX" = "1")
+#AM_CONDITIONAL(USE_ARGDATE, test "$SYS_STRPTIME" = "1")
# Detection complete
Modified: cs/cigma/branches/cigma-0.9/src/Makefile.am
===================================================================
--- cs/cigma/branches/cigma-0.9/src/Makefile.am 2007-06-26 16:59:15 UTC (rev 7510)
+++ cs/cigma/branches/cigma-0.9/src/Makefile.am 2007-06-26 17:01:45 UTC (rev 7511)
@@ -0,0 +1,12 @@
+lib_LTLIBRARIES = libcigma.la
+
+libargtable2_la_SOURCES = \
+ argtable2.c \
+ arg_end.c \
+ arg_rem.c \
+ arg_lit.c \
+ arg_int.c \
+ arg_dbl.c \
+ arg_str.c \
+ arg_file.c
+
Added: cs/cigma/branches/cigma-0.9/src/README
===================================================================
--- cs/cigma/branches/cigma-0.9/src/README 2007-06-26 16:59:15 UTC (rev 7510)
+++ cs/cigma/branches/cigma-0.9/src/README 2007-06-26 17:01:45 UTC (rev 7511)
@@ -0,0 +1,8 @@
+
+Acknowledgements
+================
+
+ - attr.h is from PyTable's H5ATTR.c
+ - hash.c can be obtained from http://www.zentus.com/c/hash.html
+ - sqlite3.c and sqlite3.h from http://www.sqlite.org/
+ - argtable2.c, argtable2.h, and arg_*.c from http://argtable.sf.net/
Modified: cs/cigma/branches/cigma-0.9/src/arg_dbl.c
===================================================================
--- cs/cigma/branches/cigma-0.9/src/arg_dbl.c 2007-06-26 16:59:15 UTC (rev 7510)
+++ cs/cigma/branches/cigma-0.9/src/arg_dbl.c 2007-06-26 17:01:45 UTC (rev 7511)
@@ -24,9 +24,9 @@
#include "config.h"
#endif
-#ifdef HAVE_STDLIB_H
+//#ifdef HAVE_STDLIB_H
#include <stdlib.h>
-#endif
+//#endif
#include "argtable2.h"
Modified: cs/cigma/branches/cigma-0.9/src/arg_file.c
===================================================================
--- cs/cigma/branches/cigma-0.9/src/arg_file.c 2007-06-26 16:59:15 UTC (rev 7510)
+++ cs/cigma/branches/cigma-0.9/src/arg_file.c 2007-06-26 17:01:45 UTC (rev 7511)
@@ -24,13 +24,13 @@
#include "config.h"
#endif
-#ifdef HAVE_STRING_H
+//#ifdef HAVE_STRING_H
#include <string.h>
-#endif
+//#endif
-#ifdef HAVE_STDLIB_H
+//#ifdef HAVE_STDLIB_H
#include <stdlib.h>
-#endif
+//#endif
#include "argtable2.h"
Modified: cs/cigma/branches/cigma-0.9/src/arg_lit.c
===================================================================
--- cs/cigma/branches/cigma-0.9/src/arg_lit.c 2007-06-26 16:59:15 UTC (rev 7510)
+++ cs/cigma/branches/cigma-0.9/src/arg_lit.c 2007-06-26 17:01:45 UTC (rev 7511)
@@ -24,9 +24,9 @@
#include "config.h"
#endif
-#ifdef HAVE_STDLIB_H
+//#ifdef HAVE_STDLIB_H
#include <stdlib.h>
-#endif
+//#endif
#include "argtable2.h"
Modified: cs/cigma/branches/cigma-0.9/src/arg_str.c
===================================================================
--- cs/cigma/branches/cigma-0.9/src/arg_str.c 2007-06-26 16:59:15 UTC (rev 7510)
+++ cs/cigma/branches/cigma-0.9/src/arg_str.c 2007-06-26 17:01:45 UTC (rev 7511)
@@ -24,9 +24,9 @@
#include "config.h"
#endif
-#ifdef HAVE_STDLIB_H
+//#ifdef HAVE_STDLIB_H
#include <stdlib.h>
-#endif
+//#endif
#include "argtable2.h"
Modified: cs/cigma/branches/cigma-0.9/src/argtable2.c
===================================================================
--- cs/cigma/branches/cigma-0.9/src/argtable2.c 2007-06-26 16:59:15 UTC (rev 7510)
+++ cs/cigma/branches/cigma-0.9/src/argtable2.c 2007-06-26 17:01:45 UTC (rev 7511)
@@ -24,29 +24,29 @@
#include "config.h"
#endif
-#ifdef STDC_HEADERS
+//#ifdef STDC_HEADERS
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
-#endif
+//#endif
-#ifdef HAVE_STRINGS_H
+//#ifdef HAVE_STRINGS_H
#include <strings.h>
-#endif
+//#endif
-#ifdef HAVE_GETOPT_H
+//#ifdef HAVE_GETOPT_H
#include <getopt.h>
-#else
-#include "./getopt.h"
-#endif
+//#else
+//#include "./getopt.h"
+//#endif
-#ifdef HAVE_UNISTD_H
+//#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif
+//#endif
#include "argtable2.h"
-#include "./getopt.h"
+//#include "./getopt.h"
static
void arg_register_error(struct arg_end *end, void *parent, int error, const char *argval)
More information about the cig-commits
mailing list