- Fix OMOptim Compilation.

- Don't add \ at the end of the last item in .pro file.
- Build OMOptimBasis in the bin directory of OMOptim.
- Added OMOptimBasis to OMTools.

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

Makefile.in

@@ -52,21 +52,24 @@ omplot: mkbuilddirs
 omedit: mkbuilddirs omplot
 	$(MAKE) -C OMEdit/OMEditGUI -f Makefile.unix
 ifeq (@with_paradiseo@,)
-omoptim:
+omoptim: mkbuilddirs omoptimbasis
 	@echo "*** OpenModelica configured without support for OMOptim (--without-paradisEO)"
 else
-omoptim: mkbuilddirs
+omoptim: mkbuilddirs omoptimbasis
 	$(MAKE) -C OMOptim/build -f Makefile.unix
 endif
+omoptimbasis: mkbuilddirs
+	$(MAKE) -C OMOptim/OMOptimBasis/build -f Makefile.unix
 
-qtclients: omnotebook omshell omedit omplot omoptim
+qtclients: omnotebook omshell omedit omplot omoptim omoptimbasis
 
 qtclean: qtclean-common
 	$(MAKE) -C OMShell/OMShellGUI -f Makefile.unix clean
 	$(MAKE) -C OMNotebook/OMNotebookGUI -f Makefile.unix clean
 	$(MAKE) -C OMEdit/OMEditGUI -f Makefile.unix clean
 	$(MAKE) -C OMPlot/OMPlotGUI -f Makefile.unix clean
 	$(MAKE) -C OMOptim/build -f Makefile.unix clean
+	$(MAKE) -C OMOptim/OMOptimBasis/build -f Makefile.unix clean
 endif
 
 fix-svn-eol-style:

OMTools/OMTools.pro

@@ -7,4 +7,5 @@ SUBDIRS += ../OMPlot/OMPlotGUI \
     ../OMEdit/OMEditGUI \
     ../OMShell/OMShellGUI \
     ../OMNotebook/OMNotebookGUI \
+    ../OMOptim/OMOptimBasis/build/OMOptimBasis.pro \
     ../OMOptim/build/OMOptim.pro \