From e878da3e60318653c5ed3cea9718841e72c2b852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sj=C3=B6lund?= Date: Mon, 30 Nov 2009 06:02:57 +0000 Subject: [PATCH] - Reverted the re-addition of the outdated configure script for Java. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@4598 f25d12d1-65f4-0310-ae8a-bbce733d8d8e --- c_runtime/Makefile.in | 93 ------------------------------------------- configure | 5 +-- configure.in | 24 +---------- 3 files changed, 2 insertions(+), 120 deletions(-) delete mode 100644 c_runtime/Makefile.in diff --git a/c_runtime/Makefile.in b/c_runtime/Makefile.in deleted file mode 100644 index 83d02c36640..00000000000 --- a/c_runtime/Makefile.in +++ /dev/null @@ -1,93 +0,0 @@ -top_builddir = .. -builddir_bin=$(top_builddir)/build/bin -builddir_lib=$(top_builddir)/build/lib -builddir_inc=$(top_builddir)/build/include - -OBJS_JAVA=@OBJS_JAVA@ -HEADER_EXTJAVA=$(OBJS_JAVA:.o=.h) -INCLUDE_JAVA=@INCLUDE_JAVA@ - -CC = gcc -FC = g77 -AR = ar -ru -UNAME := $(shell uname -m) -CMDFPUFLAGS := `case ${UNAME} in i[3456]86) echo "-msse2 -mfpmath=sse";; x86_64) echo "-msse2 -mfpmath=sse -fPIC";; *) echo "";; esac` -FPUFLAGS := ${CMDFPUFLAGS} -CFLAGS = -Wall -O3 ${FPUFLAGS} -fexceptions -ansi -pedantic -I. $(EXTRA_CFLAGS) $(INCLUDE_JAVA) -CPPFLAGS = $(CFLAGS) -FFLAGS = -O -fexceptions -# P.A: before, g77 had -O3 or -O2 but that caused a bug in DDASRT, giving infinite loop. -# Adrian Pop, adrpo@ida.liu.se -# - please leave makefile.u as if you don't it breaks the compilation on UNIX/LINUX -# - use make -f Makefile.omdev.mingw if you want to compile on MinGW - -OBJS = $(FOBJS) boolean_array.o index_spec.o integer_array.o memory_pool.o \ -base_array.o real_array.o string_array.o read_write.o utility.o \ -modelica_string.o bigden.o \ -ddasrt.o dlinpk.o enorm.o hybrd1.o nelmead.o qform.o r1updt.o \ -biglag.o ddassl.o dogleg.o fdjac1.o hybrj.o newuoa.o qrfac.o trsapp.o \ -daux.o dlamch.o dpmpar.o hybrd.o lsame.o newuob.o r1mpyq.o update.o $(EXTRA_OBJS) \ -$(OBJS_JAVA) - -SIMOBJS = $(FOBJS) simulation_runtime.o simulation_init.o simulation_input.o simulation_events.o \ -solver_dasrt.o solver_euler.o simulation_result.o tables.o options.o dgesv_aux.o meta_modelica.o $(EXTRA_SIMOBJS) \ -$(OBJS_JAVA) - -HFILES = blaswrap.h f2c.h integer_array.h memory_pool.h modelica_string.h \ - base_array.h inline.h real_array.h string_array.h boolean_array.h \ - index_spec.h matrix.h \ - modelica.h read_write.h simulation_runtime.h simulation_events.h utility.h \ - simulation_init.h simulation_input.h solver_dasrt.h solver_euler.h simulation_result.h \ - meta_modelica.h sendData/sendData.h sendData/humbug.h $(HEADER_EXTJAVA) - -LIBS = libc_runtime.a libsim.a - -ifdef QTHOME -PLTPKGCMD = cd ./sendData && $(QTHOME)/bin/qmake && $(MAKE) -f Makefile -else -PLTPKGCMD = mkdir -p sendData/release && \ -g++ -c -o sendData/libsendData.o sendData/humbug.cpp && \ -ar -ru sendData/release/libsendData.a sendData/libsendData.o -endif - -all : $(SIMOBJS) $(OBJS) libc_runtime.a libsim.a libf2c.a libsendData.a install - -$(SIMOBJS) : $(HFILES) *.c* -$(OBJS) : $(HFILES) *.c* - -libc_runtime.a : $(OBJS) - $(AR) $@ $(OBJS) - - -install: libc_runtime.a libsim.a libf2c/libf2c.a - cp $(HFILES) $(builddir_inc)/ - cp $(LIBS) $(builddir_lib)/ - cp libf2c/libf2c.* $(builddir_lib)/ - cp sendData/release/libsendData.a $(builddir_lib)/ - -libsim.a : $(SIMOBJS) - $(AR) $@ $(SIMOBJS) - -libf2c.a : - cd libf2c && $(MAKE) -f makefile.u - -libsendData.a : sendData/sendData.cpp sendData/sendData.h sendData/sendData.pro sendData/humbug.h sendData/humbug.cpp -# cd ./sendData && \ -# $(QTHOME)/bin/qmake && \ -# sed -e's/QtNetwork /QtNetwork4 /' -e's/QtGui /QtGui4 /' -e's/QtCore /QtCore4 /' Makefile.Release > Makefile && \ -# $(MAKE) -f Makefile - $(PLTPKGCMD) - -clean : - cd ./libf2c && $(MAKE) -f makefile.u clean - rm -f libc_runtime.a - rm -f libsim.a - rm -f $(OBJS) - rm -f $(SIMOBJS) - rm -f $(builddir_lib)/libc_runtime.a - rm -f $(builddir_lib)/libsim.a - rm -f $(builddir_lib)/libf2c.* - cd $(builddir_inc)/ && rm -f $(HFILES) - cd sendData && rm -fr release debug *sendData*.o *sendData*.a - rm -rf sendData/release sendData/debug - rm -f sendData.o sendData.a sendData/releasesendData.o diff --git a/configure b/configure index 8105858db2a..d9c70204607 100755 --- a/configure +++ b/configure @@ -1283,7 +1283,6 @@ if test -n "$ac_init_help"; then Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-java=DIR With JVM in DIR --with-CORBA=DIR use corba installed in DIR /usr/local --with-omniORB=DIR use omniORB installed in DIR --with-MODPAR Compile with automatic parallelization, requires boost @@ -4020,7 +4019,7 @@ $as_echo "Not compiling with BOOST" >&6; }; USE_MODPAR=""; BOOSTHOME="" fi -ac_config_files="$ac_config_files Makefile c_runtime/Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/template_precompile/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/absyn_builder/Makefile modelica_parser/test/lexer/Makefile Compiler/test_codegen/Makefile Compiler/runtime/Makefile modelica_parser/src/Makefile Compiler/modpar/Makefile flat_modelica_parser/src/Makefile" +ac_config_files="$ac_config_files Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/absyn_builder/Makefile modelica_parser/test/lexer/Makefile Compiler/test_codegen/Makefile Compiler/runtime/Makefile modelica_parser/src/Makefile Compiler/modpar/Makefile flat_modelica_parser/src/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -4717,11 +4716,9 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "c_runtime/Makefile") CONFIG_FILES="$CONFIG_FILES c_runtime/Makefile" ;; "Compiler/rml2sig/Makefile") CONFIG_FILES="$CONFIG_FILES Compiler/rml2sig/Makefile" ;; "modelica_parser/test/parser/Makefile") CONFIG_FILES="$CONFIG_FILES modelica_parser/test/parser/Makefile" ;; "mosh/src/Makefile") CONFIG_FILES="$CONFIG_FILES mosh/src/Makefile" ;; - "Compiler/template_precompile/Makefile") CONFIG_FILES="$CONFIG_FILES Compiler/template_precompile/Makefile" ;; "Compiler/Makefile") CONFIG_FILES="$CONFIG_FILES Compiler/Makefile" ;; "Compiler/omc_release/Makefile") CONFIG_FILES="$CONFIG_FILES Compiler/omc_release/Makefile" ;; "Compiler/omc_debug/Makefile") CONFIG_FILES="$CONFIG_FILES Compiler/omc_debug/Makefile" ;; diff --git a/configure.in b/configure.in index 7f301bafec9..c84c2d902e9 100644 --- a/configure.in +++ b/configure.in @@ -17,8 +17,6 @@ AC_SUBST(CORBALIBS) AC_SUBST(IDLCMD) AC_SUBST(USE_MODPAR) AC_SUBST(BOOSTHOME) -AC_SUBST(INCLUDE_JAVA) -AC_SUBST(OBJS_JAVA) dnl Checks for programs. AC_PROG_CC @@ -75,26 +73,6 @@ else AC_MSG_RESULT([yes]) fi -AC_MSG_CHECKING([for jni.h]) -AC_ARG_WITH(java, [ --with-java=DIR With JVM in DIR], -[ -if test "x$withval" = "xno" ; then - AC_MSG_RESULT([Not compiling with Java]); - INCLUDE_JAVA=""; OBJS_JAVA=""; -else - if test -e $withval/include/jni.h; then - AC_MSG_RESULT([$withval/include]); - INCLUDE_JAVA="-I$withval/include"; - OBJS_JAVA="java_interface.o"; - else - AC_MSG_ERROR([Could not find jni.h in $withval/include]); - fi -fi -], [ -AC_MSG_RESULT([Not compiling with Java]); -INCLUDE_JAVA=""; OBJS_JAVA=""; -]) - AC_MSG_CHECKING([for antlr header files]) antlrinc=`find $ANTLRHOME /usr/local/include -type f -name TreeParser.hpp -print | head -1 | awk -F/ '{ total="";for (i = 1 ; i < NF-1; i++) total= total $i "/"; print total}'` if test -z "$antlrinc" ; then @@ -267,5 +245,5 @@ fi AC_MSG_RESULT([Not compiling with BOOST]); USE_MODPAR=""; BOOSTHOME="" ]) -AC_OUTPUT(Makefile c_runtime/Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/template_precompile/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/absyn_builder/Makefile modelica_parser/test/lexer/Makefile Compiler/test_codegen/Makefile Compiler/runtime/Makefile modelica_parser/src/Makefile Compiler/modpar/Makefile flat_modelica_parser/src/Makefile) +AC_OUTPUT(Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/absyn_builder/Makefile modelica_parser/test/lexer/Makefile Compiler/test_codegen/Makefile Compiler/runtime/Makefile modelica_parser/src/Makefile Compiler/modpar/Makefile flat_modelica_parser/src/Makefile)