Skip to content

Commit

Permalink
- Fix for Makefile.humbug (use the configured CFLAGS so e.g. -fPIC is…
Browse files Browse the repository at this point in the history
… used)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@7218 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Nov 27, 2010
1 parent 85f4086 commit 8171d25
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
5 changes: 0 additions & 5 deletions c_runtime/sendData/Makefile.humbug

This file was deleted.

10 changes: 10 additions & 0 deletions c_runtime/sendData/Makefile.humbug.in
@@ -0,0 +1,10 @@
CFLAGS=@CFLAGS@
CXXFLAGS=@CFLAGS@

release/libsendDataHumbug.a: humbug.o
mkdir -p release
ar -ru $@ $<
ranlib $@

Makefile.humbug: Makefile.humbug.in
(cd ../../; ./config.status)
2 changes: 1 addition & 1 deletion configure
Expand Up @@ -4765,7 +4765,7 @@ fi

date=`date "+%Y-%m-%d %H:%M:%S"`

GENERATED_AUTOCONF_FILES="Makefile c_runtime/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/omc_profiler/Makefile Compiler/runtime/Makefile Compiler/modpar/Makefile c_runtime/interactive/Makefile OMNotebook/ext/OMPlotWindow.config OMNotebook/OMNotebookQT4/OMNotebook.config OMShell/OMShell.config Compiler/runtime/config.unix.h OMNotebook/OMNotebookQT4/Makefile.unix OMShell/Makefile.unix OMNotebook/ext/Makefile.unix Parser/Makefile c_runtime/ModelicaExternalC/Makefile"
GENERATED_AUTOCONF_FILES="Makefile c_runtime/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/omc_profiler/Makefile Compiler/runtime/Makefile Compiler/modpar/Makefile c_runtime/interactive/Makefile OMNotebook/ext/OMPlotWindow.config OMNotebook/OMNotebookQT4/OMNotebook.config OMShell/OMShell.config Compiler/runtime/config.unix.h OMNotebook/OMNotebookQT4/Makefile.unix OMShell/Makefile.unix OMNotebook/ext/Makefile.unix Parser/Makefile c_runtime/ModelicaExternalC/Makefile c_runtime/sendData/Makefile.humbug"

ac_config_commands="$ac_config_commands config.unix.h.fix"

Expand Down
2 changes: 1 addition & 1 deletion configure.in
Expand Up @@ -390,7 +390,7 @@ AC_MSG_RESULT([Not compiling with BOOST]); USE_MODPAR=""; BOOSTHOME=""
])
date=`date "+%Y-%m-%d %H:%M:%S"`

GENERATED_AUTOCONF_FILES="Makefile c_runtime/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/omc_profiler/Makefile Compiler/runtime/Makefile Compiler/modpar/Makefile c_runtime/interactive/Makefile OMNotebook/ext/OMPlotWindow.config OMNotebook/OMNotebookQT4/OMNotebook.config OMShell/OMShell.config Compiler/runtime/config.unix.h OMNotebook/OMNotebookQT4/Makefile.unix OMShell/Makefile.unix OMNotebook/ext/Makefile.unix Parser/Makefile c_runtime/ModelicaExternalC/Makefile"
GENERATED_AUTOCONF_FILES="Makefile c_runtime/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/omc_profiler/Makefile Compiler/runtime/Makefile Compiler/modpar/Makefile c_runtime/interactive/Makefile OMNotebook/ext/OMPlotWindow.config OMNotebook/OMNotebookQT4/OMNotebook.config OMShell/OMShell.config Compiler/runtime/config.unix.h OMNotebook/OMNotebookQT4/Makefile.unix OMShell/Makefile.unix OMNotebook/ext/Makefile.unix Parser/Makefile c_runtime/ModelicaExternalC/Makefile c_runtime/sendData/Makefile.humbug"

AC_CONFIG_COMMANDS([config.unix.h.fix],[./configure-post.sh $ac_cs_config])

Expand Down

0 comments on commit 8171d25

Please sign in to comment.