Adrian Pop, 2005-02-26

Changed some Makefile.in to copy 
executables directly into trunk/. not Compiler/. 
Also now it uses EXEEXT in all the needed Makefiles.
This change is to allow mosh to find the omc compiler in the 
OPENMODELICAHOME not in OPENMODELICAHOME/Compiler
and to move forward to a structure like:
trunk/build
      |-bin
      |-lib
      \-include
meaning that all the needed files should be in the trunk/build directory 
after compilation. 

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

Compiler/Makefile.in

@@ -45,9 +45,9 @@ SUBDIRS	= runtime absyn_builder modpar
 #all : debug 
 all : release
 
-debug:	$(PROGD) $(SRCRDB)
+debug:	$(PROGD)$(EXEEXT) $(SRCRDB)
 
-release: $(PROG)
+release: $(PROG)$(EXEEXT)
 
 $(SRCRDB): %.rdb: omc_debug/%.rdb 
 	cp $< $@
@@ -57,11 +57,11 @@ $(SRCRDB): %.rdb: omc_debug/%.rdb
 #		cp omc_debug/$$x .; \
 #	done
 
-$(PROG): omc_release
-	cp omc_release/$(PROG)$(EXEEXT) .
+$(PROG)$(EXEEXT): omc_release
+	cp omc_release/$(PROG)$(EXEEXT) $(top_builddir)/.
 
-$(PROGD): omc_debug
-	cp omc_debug/$(PROGD)$(EXEEXT) .
+$(PROGD)$(EXEEXT): omc_debug
+	cp omc_debug/$(PROGD)$(EXEEXT) $(top_builddir)/.
 
 omc_release:
 	(cd omc_release && $(MAKE))
@@ -78,9 +78,6 @@ vctarget:
 	@(cd omc_release ; $(MAKE) vctarget)
 
 
-
-
-
 test:
 	@(cd ../testsuite ; $(MAKE))
 
@@ -99,7 +96,7 @@ clean:
 	done
 	(cd omc_release; $(MAKE) clean)
 	-$(RM) -f $(SRCH)
-	-$(RM) -f $(PROG)$(EXEEXT)
+	-$(RM) -f $(top_builddir)/$(PROG)$(EXEEXT)
 
 dclean:
 	@for d in $(SUBDIRS); do \
@@ -108,7 +105,7 @@ dclean:
 	(cd omc_debug; $(MAKE) clean)
 	-$(RM) -f $(SRCRDB)
 	-$(RM) -f $(SRCH)
-	-$(RM) -f $(PROGD)$(EXEEXT)
+	-$(RM) -f $(top_builddir)/$(PROGD)$(EXEEXT)
 
 
 reallyclean:
@@ -117,7 +114,7 @@ reallyclean:
 	done
 	(cd omc_release; $(MAKE) reallyclean)
 	-$(RM) -f $(SRCH)
-	-$(RM) -f $(PROG)$(EXEEXT)
+	-$(RM) -f $(top_builddir)/$(PROG)$(EXEEXT)
 
 dreallyclean: 
 	@for d in $(SUBDIRS); do \
@@ -126,7 +123,7 @@ dreallyclean:
 	(cd omc_debug; $(MAKE) reallyclean)
 	-$(RM) -f $(SRCRDB)
 	-$(RM) -f $(SRCH)
-	-$(RM) -f $(PROGD)$(EXEEXT)
+	-$(RM) -f $(top_builddir)/$(PROGD)$(EXEEXT)
 
 report:
 	@(cd report ; $(MAKE))

Compiler/omc_debug/Makefile.in

@@ -21,6 +21,8 @@ RMLINC  = -I$(RMLHOME)/include/plain
 USE_CORBA = @USE_CORBA@
 CORBAHOME = @CORBAHOME@
 
+EXEEXT = @EXEEXT@
+
 srcdir = ..
 top_builddir = ../..
 
@@ -46,7 +48,7 @@ RML	= @rmlc_bin@ -g -Wc,-O3 -Wr,-East,-Ecps,-Efol
 
 SUBDIRS	= $(srcdir)/runtime $(srcdir)/absyn_builder $(srcdir)/modpar
 
-all : $(ALLRML) subdirs $(PROG)
+all : $(ALLRML) subdirs $(PROG)$(EXEEXT)
 
 
 .SUFFIXES:
@@ -81,8 +83,8 @@ vctarget: $(SRCC) absyn_subdir
 absyn_subdir:
 	@(cd $(srcdir)/absyn_builder ; $(MAKE) vctarget)
 
-$(PROG): $(SRCO) $(AST) $(RTOBJ)
-	g++ -o $(PROG) $(SRCO) $(AST) $(RTOBJ) $(LDFLAGS)
+$(PROG)$(EXEEXT): $(SRCO) $(AST) $(RTOBJ)
+	g++ -o $(PROG)$(EXEEXT) $(SRCO) $(AST) $(RTOBJ) $(LDFLAGS)
 
 subdirs: $(SRCHSRCDIR)
 	@for d in $(SUBDIRS); do \
@@ -94,10 +96,10 @@ clean:
 		(cd $$d ; $(MAKE) clean) \
 	done
 	(cd $(srcdir) && $(RM) $(SRCH))
-	$(RM) $(SRCO) $(SRCC) $(SRCH) $(PROG) *~
+	$(RM) $(SRCO) $(SRCC) $(SRCH) $(PROG)$(EXEXT) *~
 
 reallyclean: clean
-	$(RM) $(ALLRML) $(ALLRML:.rml=.sig)  $(SRCRDB) $(PROG)
+	$(RM) $(ALLRML) $(ALLRML:.rml=.sig)  $(SRCRDB) $(PROG)$(EXEEXT)
 
 # don't remove these files after intermediate build steps
 .PRECIOUS: Makefile $(ALLRML)

Compiler/omc_release/Makefile.in

@@ -23,6 +23,8 @@ CFLAGS	= $(USE_CORBA)
 RMLHOME	= @rmlhome@
 RMLINC  = -I$(RMLHOME)/include/plain
 
+EXEEXT  = @EXEEXT@
+
 srcdir = ..
 top_builddir = ../..
 include $(srcdir)/Makefile.common
@@ -88,8 +90,8 @@ vctarget: $(SRCC) absyn_subdir
 absyn_subdir:
 	@(cd $(srcdir)/absyn_builder ; $(MAKE) vctarget)
 
-$(PROG): $(SRCO) $(AST) $(RTOBJ)
-	g++ -o $(PROG) $(SRCO) $(AST) $(RTOBJ) $(LDFLAGS)
+$(PROG)$(EXEEXT): $(SRCO) $(AST) $(RTOBJ)
+	g++ -o $(PROG)$(EXEEXT) $(SRCO) $(AST) $(RTOBJ) $(LDFLAGS)
 
 subdirs: $(SRCHSRCDIR)
 	@for d in $(SUBDIRS); do \
@@ -101,10 +103,10 @@ clean:
 		(cd $$d ; $(MAKE) clean) \
 	done
 	(cd $(srcdir) && $(RM) $(SRCH))
-	$(RM) $(SRCO) $(SRCC) $(SRCH) $(PROG) *~
+	$(RM) $(SRCO) $(SRCC) $(SRCH) $(PROG)$(EXEEXT) *~
 
 reallyclean: clean
-	$(RM) $(ALLRML) $(ALLRML:.rml=.sig)  $(SRCRDB) $(PROG)
+	$(RM) $(ALLRML) $(ALLRML:.rml=.sig)  $(SRCRDB) $(PROG)$(EXEEXT)
 
 # don't remove these files after intermediate build steps
 .PRECIOUS: Makefile $(ALLRML)