- Update makefiles for qtclients.

  - Added Makefile.unix.in in each client's directory
  - Should be easier to customize behaviour now
  - Now copies the binary from OSX .app's into the build dir when doing a Unix build


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

Makefile.in

@@ -39,22 +39,19 @@ qtclients:
 	@echo "*** OpenModelica configured without support for CORBA"
 qtclean: qtclean-common
 else
-qtclients: mkbuilddirs
-	echo "Coin3D (www.coin3d.org) and SoQt should be installed and in the path!"
-	(cd OMShell && (test -f omc_communication.cc || @IDLCMD@ ../Compiler/runtime/omc_communication.idl) && CORBALIBS="@CORBALIBS@" CORBAINCL="@CORBACFLAGS@" $(QMAKE) && make && cp -rp OMShell$(EXE) ../$(builddir_bin)/.)
-	(cd OMNotebook/ext && $(QMAKE) && make && cp -rp OMPlotWindow$(EXE) ../../$(builddir_bin)/.)
-	(cd OMNotebook/OMNotebookQT4 && (test -f omc_communication.cc || @IDLCMD@ ../../Compiler/runtime/omc_communication.idl) && $(QMAKE) && make)
-	cp -rp OMNotebook/OMNotebookQT4/OMNotebook$(EXE) $(builddir_bin)
-	cp -p OMNotebook/OMNotebookQT4/*.xml $(builddir_share)/omnotebook
-	cp -p OMNotebook/OMNotebookQT4/commands.xml $(builddir_share)/omshell
+omnotebook: mkbuilddirs
+	make -C OMNotebook/OMNotebookQT4 -f Makefile.unix 
+omshell: mkbuilddirs
+	make -C OMShell -f Makefile.unix
+omplotwindow: mkbuilddirs
+	make -C OMNotebook/ext -f Makefile.unix
+
+qtclients: omnotebook omshell omplotwindow
 
 qtclean: qtclean-common
-	rm -rf OMNotebook/ext/ext$(EXE) OMNotebook/ext/OMPlotWindow$(EXE)
-	rm -rf OMShell/OMShell$(EXE) OMShell/omc_communication.*
-	rm -rf OMNotebook/OMNotebookQT4/OMNotebook$(EXE) OMNotebook/OMNotebookQT4/omc_communication.*
-	(cd OMShell && $(QMAKE) && make clean)
-	(cd OMNotebook/ext && $(QMAKE) && make clean)
-	(cd OMNotebook/OMNotebookQT4 && $(QMAKE) && make clean)
+	make -C OMShell -f Makefile.unix clean
+	make -C OMNotebook/ext -f Makefile.unix clean
+	make -C OMNotebook/OMNotebookQT4 -f Makefile.unix clean
 endif
 
 fix-svn-eol-style:

configure

@@ -4706,7 +4706,7 @@ fi
 
 date=`date "+%Y-%m-%d %H:%M:%S"`
 
-GENERATED_AUTOCONF_FILES="Makefile c_runtime/Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/omc_profiler/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 c_runtime/interactive/Makefile OMNotebook/ext/OMPlotWindow.config OMNotebook/OMNotebookQT4/OMNotebook.config OMShell/OMShell.config Compiler/runtime/config.unix.h"
+GENERATED_AUTOCONF_FILES="Makefile c_runtime/Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/omc_profiler/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 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"
 
 ac_config_commands="$ac_config_commands config.unix.h.fix"
 

configure.in

@@ -341,7 +341,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 Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/omc_profiler/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 c_runtime/interactive/Makefile OMNotebook/ext/OMPlotWindow.config OMNotebook/OMNotebookQT4/OMNotebook.config OMShell/OMShell.config Compiler/runtime/config.unix.h"
+GENERATED_AUTOCONF_FILES="Makefile c_runtime/Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/omc_profiler/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 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"
 
 AC_CONFIG_COMMANDS([config.unix.h.fix],[./configure-post.sh $ac_cs_config])