Skip to content

Commit

Permalink
Use the nolink target
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20108 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Apr 11, 2014
1 parent 5890f74 commit fcd6647
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Compiler/omc_release/Makefile.in
Expand Up @@ -59,7 +59,7 @@ $(PROG):
$(OMPCC) $(CFLAGS) -o $(PROG)$(EXEEXT) $(SRCO) $(AST) $(RTOBJ) $(LDFLAGS) $(FMILIB) -lstdc++

nolink:
$(MAKE) -C Template
$(MAKE) -C ../Template
$(MAKE) .depend
$(MAKE) DAE.c
$(MAKE) allobjs $(SUBDIRS)
Expand Down
8 changes: 4 additions & 4 deletions Makefile.in
Expand Up @@ -64,7 +64,7 @@ omc-rml: omc-diff interactive docs fmil opencl_rt lis omc-rml-nolink
$(MAKE) -C Compiler -f Makefile release
$(MAKE) omlibrary
omc-rml-nolink:
$(MAKE) -C Compiler/omc_release
$(MAKE) -C Compiler/omc_release nolink

boehm-gc-lib: @LIBGC@
build/lib/omc/libgc.so: 3rdParty/gc-7.2/.libs/libgc.so
Expand All @@ -88,7 +88,7 @@ qtclean: qtclean-common
else
omnotebook: mkbuilddirs omplot
mkdir -p $(builddir_share)/omnotebook
$(MAKE) -C OMNotebook/OMNotebookGUI -f Makefile.unix
$(MAKE) -C OMNotebook/OMNotebookGUI -f Makefile.unix
omshell: mkbuilddirs
$(MAKE) -C OMShell/OMShellGUI -f Makefile.unix
omplot: mkbuilddirs boehm-gc-lib
Expand Down Expand Up @@ -146,7 +146,7 @@ lis: lis-configure mkbuilddirs
@# FreeBSD lis does not create the symlinks...
! test -f build/lib/omc/liblis.so.0.0 -a ! -f build/lib/omc/liblis.so.0 || ln -s liblis.so.0.0 build/lib/omc/liblis.so.0
! test -f build/lib/omc/liblis.so.0.0 -a ! -f build/lib/omc/liblis.so || ln -s liblis.so.0.0 build/lib/omc/liblis.so
lis-configure:
lis-configure:
# Configure and build lis
if ! test -f 3rdParty/lis-1.4.12/Makefile; then cd 3rdParty/lis-1.4.12 && ./configure "--host=$(host)" --enable-shared --disable-static MPICC="false" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS) @LIS_LDFLAGS@" && $(MAKE) clean; fi
lis-clean:
Expand All @@ -156,7 +156,7 @@ lis-clean:
fix-svn-props:
tools/apply_autoprops.py --config .svnprops .
fix-bom:
find . -type f \( ! -path '*/.svn/*' -prune \) | while read file;do sed -i '1 s/^\xef\xbb\xbf//' "$$file";done
find . -type f \( ! -path '*/.svn/*' -prune \) | while read file;do sed -i '1 s/^\xef\xbb\xbf//' "$$file";done

SOURCE_DIRS=$(SOURCE_DIRS_UTF8) "libraries/Modelica 2.2.2" testsuite/flattening/libraries/3rdParty/HumMod
SOURCE_DIRS_UTF8=OM*/ Compiler/ SimulationRuntime/ mosh/ `bash -c echo libraries/{BioChem 1.0,ModelicaAdditions,Modelica_LinearSystems2 2.3,Modelica 1.6,ModelicaServices 1.0,ModelicaServices 1.0 modelica3d,Modelica 3.1,SimpleFluid,Modelica 3.2.1,SimpleVisual.mo}` `bash -c echo testsuite/flattening/libraries/3rdParty/{PlanarMechanics,siemens,SiemensPower,ThermoSysPro}` testsuite/openmodelica/modelicaML testsuite/AVM testsuite/simulation
Expand Down

0 comments on commit fcd6647

Please sign in to comment.