Changeset e36a5856 in OpenModelica

Timestamp:

2013-04-11T15:54:59+02:00 (11 years ago)

Author:

Martin Sjölund <martin.sjolund@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

c5d0cdce

Parents:

1128d994

Message:

Change to using the build system in OpenSourceTables

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@15791 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Files:

• SimulationRuntime/c/ModelicaExternalC/Makefile.common (modified) (2 diffs)
• SimulationRuntime/c/ModelicaExternalC/Makefile.in (modified) (1 diff)
• configure.in (modified) (5 diffs)

SimulationRuntime/c/ModelicaExternalC/Makefile.common

@@ -8 +8 @@
 
 MOEXTC_OBJS = ModelicaInternal.o ModelicaStrings.o ModelicaTablesImpl.o tables.o
-TABLESOURCEDIR = ../../../libraries/OpenSourceTables/Modelica/NewTables/Resources/C-Sources
+TABLEBUILDDIR = ../../../libraries/OpenSourceTables/unix
 builddir = ../../../build
-TABLEOBJS = ModelicaTables.o ModelicaMatIO.o
 
-all: libModelicaExternalC.a $(LIBMODELICATABLES)
+all: libModelicaExternalC.a ModelicaTables
 
-ModelicaTables.o : $(TABLESOURCEDIR)/ModelicaTables.c
-  $(CC) $(CPPFLAGS) $(TABLESCPPFLAGS) $(CFLAGS) -o $@ -c $<
-ModelicaMatIO.o : $(TABLESOURCEDIR)/ModelicaMatIO.c
-  $(CC) $(CPPFLAGS) $(TABLESCPPFLAGS) $(CFLAGS) -o $@ -c $<
-
-libModelicaTables.a : $(TABLEOBJS)
-  @rm -f $@
-  $(AR) $@ $(TABLEOBJS)
-  ranlib $@
-
+ModelicaTables : $(TABLEBUILDDIR)/Makefile
+  $(MAKE) -C $(TABLEBUILDDIR)
+$(TABLEBUILDDIR)/Makefile : $(TABLEBUILDDIR)/configure $(REGEN)
+  cd $(TABLEBUILDDIR) && ./configure CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="-Wno-unused-result $(CPPFLAGS)"
+  make -C $(TABLEBUILDDIR) clean
+$(TABLEBUILDDIR)/configure : $(TABLEBUILDDIR)/autogen.sh
+  cd $(TABLEBUILDDIR) && ./autogen.sh
+  
 libModelicaExternalC.a : $(MOEXTC_OBJS)
   @rm -f $@
@@ -29 +26 @@
   ranlib $@
 
-install : all
-  cp libModelicaExternalC.a $(LIBMODELICATABLES) $(builddir)/lib/omc
+install : all ModelicaTables
+  cp libModelicaExternalC.a $(builddir)/lib/omc
+  cp -Pp $(TABLEBUILDDIR)/.libs/$(MODELICATABLES) $(builddir)/lib/omc
 clean:
   rm -f libModelicaExternalC.a $(MOEXTC_OBJS) $(TABLEOBJS)
-
+  (! test -f $(TABLEBUILDDIR)/Makefile) || make -C $(TABLEBUILDDIR) clean

SimulationRuntime/c/ModelicaExternalC/Makefile.in

@@ -7 +7 @@
 CC = @CC@
 CXX = @CXX@
-CFLAGS = @CFLAGS@ -I../util -Wno-unused-result
+CFLAGS = @CFLAGS@ -I../util
 CPPFLAGS = @CPPFLAGS@ -I.. -Dlinux
-TABLESCPPFLAGS = @LIBMODELICATABLESCPPFLAGS@
-TABLESLDFLAGS = @LIBMODELICATABLESLDFLAGS@
-
-LIBMODELICATABLES = @LIBMODELICATABLES@
+REGEN = Makefile.in
+MODELICATABLES = libModelicaTables@SHREXT@*
 
 include Makefile.common
 
-libModelicaTables.so : $(TABLEOBJS)
-  $(CC) -o $@ -shared $(TABLEOBJS) $(LDFLAGS) $(TABLESLDFLAGS)
-
 Makefile: Makefile.in
   cd ../../../; ./config.status

configure.in

@@ -2 +2 @@
 
 AC_PREREQ([2.63])
-AC_INIT(SimulationRuntime/c/util/boolean_array.c)
+AC_INIT([OpenModelica],[dev],[https://trac.modelica.org/Modelica],[openmodelica],[https://trac.openmodelica.org/OpenModelica])
 AC_SUBST(date)
 AC_SUBST(rmlc_bin)
@@ -59 +59 @@
 AC_SUBST(LIBRUNTIME)
 AC_SUBST(LIBFMIRUNTIME)
-AC_SUBST(LIBMODELICATABLESCPPFLAGS)
-AC_SUBST(LIBMODELICATABLESLDFLAGS)
-AC_SUBST(LIBMODELICATABLES)
+AC_SUBST(SHREXT)
 
 FINAL_MESSAGES="\nConfigured OpenModelica successfully using the following options:"
@@ -78 +76 @@
 
 dnl Checks for programs.
+AC_LANG([C])
 AC_PROG_CC
 AC_PROG_CXX
@@ -381 +380 @@
       [AC_MSG_ERROR([no])])
 ])
-
-LIBS="-lz -lhdf5 -lm"
-
-CPPFLAGS_BAK=$CPPFLAGS
-ZLIB=1
-HDF5=1
-MPI_CPPFLAGS=""
-AC_MSG_CHECKING([hdf5.h])
-AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[#include <hdf5.h>]],[])],AC_MSG_RESULT([OK]),[
-  MPI_CPPFLAGS=`OMPI_CC=$CC mpicc -showme:compile`
-  CPPFLAGS="$CPPFLAGS $MPI_CPPFLAGS"
-  AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[#include <hdf5.h>]],[])],AC_MSG_RESULT([[OK, needs mpi.h]]),[HDF5="";AC_MSG_RESULT([failed])])
-])
-CPPFLAGS=$CPPFLAGS_BAK
-AC_CHECK_HEADERS(zlib.h,[],[ZLIB=""])
-
-if test -z "$HDF5" || test -z "$ZLIB"; then
-WITH_HDF5=no
-else
-
-AC_MSG_CHECKING([hdf5 linking])
-AC_LINK_IFELSE([AC_LANG_CALL([], [H5Fopen])],
-  [AC_MSG_RESULT([ok]); WITH_HDF5="yes"],
-  [AC_MSG_RESULT([failed to link H5Fopen]); WITH_HDF5="no"])
-
-fi
-
-if test "$WITH_HDF5" = "yes"; then
-FINAL_MESSAGES="$FINAL_MESSAGES\nModelica Tables may use HDF5,ZLIB,MAT 7.3: Yes"
-LIBMODELICATABLES=libModelicaTables.so
-LIBMODELICATABLESCPPFLAGS="-DHAVE_HDF5=1 -DMAT73=1 -DHAVE_ZLIB=1 -DDUMMY_FUNCTION_USERTAB $MPI_CPPFLAGS"
-LIBMODELICATABLESLDFLAGS="$LIBS"
-else
-FINAL_MESSAGES="$FINAL_MESSAGES\nModelica Tables may use HDF5,ZLIB,MAT 7.3: No"
-LIBMODELICATABLES=libModelicaTables.a
-LIBMODELICATABLESCPPFLAGS="-DDUMMY_FUNCTION_USERTAB"
-LIBMODELICATABLESLDFLAGS=""
-fi
 
 LIBS=""
@@ -682 +643 @@
 if test "Darwin" = `uname`; then
   EXE=".app"
+  SHREXT=".dylib"
   LIBGC="build/lib/omc/libgc.a"
   LIBSIMULATION=libSimulationRuntimeC.a
   LIBRUNTIME=libOpenModelicaRuntimeC.a
   LIBFMIRUNTIME=libOpenModelicaFMIRuntimeC.a
+  RT_LDFLAGS="$RT_LDFLAGS -liconv -lgc $OPENMP"
 else
   EXE=""
+  SHREXT=".so"
   LIBGC="build/lib/omc/libgc.so build/lib/omc/libgc.so.1 build/lib/omc/libgc.so.1.0.3"
   LIBSIMULATION=libSimulationRuntimeC.a
   LIBRUNTIME=libOpenModelicaRuntimeC.so
   LIBFMIRUNTIME=libOpenModelicaFMIRuntimeC.a
-fi
-
-if test "Darwin" != `uname`; then
   RT_LDFLAGS="$RT_LDFLAGS -lrt -lgc $OPENMP"
-else
-  RT_LDFLAGS="$RT_LDFLAGS -liconv -lgc $OPENMP"
 fi