- cleaning up makefiles

- using rmldep-new.sh in Linux makefiles also


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

Compiler/Makefile.common

@@ -70,7 +70,6 @@ ALLMO = $(SRCMO) DAEEXT.mo Print.mo RTOpts.mo System.mo Parser.mo \
 
 SRCC=	$(SRCMO:.mo=.c)
 SRCH=	$(SRCMO:.mo=.h)
-SRCSIG=	$(SRCMO:.mo=.sig)
-SRCRDB=	$(SRCMO:.mo=.rdb)
+SRCSIG=	$(ALLMO:.mo=.sig)
 SRCO=	$(SRCC:.c=.o)
 

Compiler/Makefile.in

@@ -56,14 +56,6 @@ debug:	$(PROGD) dinstall
 
 release: $(PROG) install
 
-$(SRCRDB): %.rdb: omc_debug/%.rdb 
-	cp $< $@
-
-#	@for x in $(SRCRDB); do \
-#		echo $$x;\
-#		cp omc_debug/$$x .; \
-#	done
-
 $(PROG): omc_release
 	echo Copying $(PROG)$(EXEEXT) into $(builddir_bin)
 	cp omc_release/$(PROG)$(EXEEXT) $(builddir_bin)/
@@ -139,7 +131,6 @@ dclean:
 		(cd $$d ; $(MAKE) clean) \
 	done
 	(cd omc_debug; $(MAKE) clean)
-	-$(RM) -f $(SRCRDB)
 	-$(RM) -f $(SRCH)
 	-$(RM) -f $(builddir)/$(PROGD)$(EXEEXT)
 	-cd $(builddir_bin) && rm -f $(SCRIPTS_FILES) && rm -f $(DOC_FILES)
@@ -158,7 +149,6 @@ dreallyclean:
 		(cd $$d ; $(MAKE) reallyclean) \
 	done
 	(cd omc_debug; $(MAKE) reallyclean)
-	-$(RM) -f $(SRCRDB)
 	-$(RM) -f $(SRCH)
 	-$(RM) -f $(builddir)/$(PROGD)$(EXEEXT)
 

Compiler/omc_debug/Makefile.in

@@ -85,9 +85,8 @@ $(SRCHSRCDIR) : $(srcdir)/%.h : %.h
 $(SRCH): %.h : %.mo
 	$(RMLC) -c $<
 
-%.sig : %.mo
-	$(RML) -fdump-interface $< > $@
-
+$(SRCSIG): %.sig : %.mo
+	$(srcdir)/rml2sig/rmldep-new.sh $<
 
 vctarget: $(SRCC) absyn_subdir
 
@@ -111,7 +110,7 @@ clean:
 	$(RM) $(SRCO) $(SRCC) $(SRCH) $(PROG)$(EXEXT) *~
 
 reallyclean: clean
-	$(RM) $(ALLMO) $(ALLMO:.mo=.sig)  $(SRCRDB) $(PROG)$(EXEEXT)
+	$(RM) $(ALLMO) $(ALLMO:.mo=.sig) $(PROG)$(EXEEXT)
 
 # don't remove these files after intermediate build steps
 .PRECIOUS: Makefile $(ALLMO)

Compiler/omc_release/Makefile.in

@@ -88,9 +88,8 @@ $(SRCHSRCDIR) : $(srcdir)/%.h : %.h
 $(SRCH): %.h : %.mo
 	$(RMLC) -c $<
 
-%.sig : %.mo
-	$(RML) -fdump-interface $< > $@
-
+$(SRCSIG): %.sig : %.mo
+	$(srcdir)/rml2sig/rmldep-new.sh $<
 
 vctarget: $(SRCC) absyn_subdir
 
@@ -114,7 +113,7 @@ clean:
 	$(RM) $(SRCO) $(SRCC) $(SRCH) $(PROG)$(EXEEXT) *~
 
 reallyclean: clean
-	$(RM) $(ALLMO) $(ALLMO:.mo=.sig)  $(SRCRDB) $(PROG)$(EXEEXT)
+	$(RM) $(ALLMO) $(ALLMO:.mo=.sig) $(PROG)$(EXEEXT)
 
 # don't remove these files after intermediate build steps
 .PRECIOUS: Makefile $(ALLMO)

Compiler/rml2sig/rmldep-new.sh

@@ -11,7 +11,7 @@ TMPMSG=""
 mydir="`dirname $0`"
 
 if [ -z "${OMDEV}" ]; then
-  RML=rml
+  RML=${RMLHOME}/bin/rml
 else
   RML=${OMDEV}/tools/rml/bin/rml
 fi