Skip to content

Commit

Permalink
- more proper clean
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23576 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Nov 27, 2014
1 parent 0fcfe95 commit 4e9e185
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
2 changes: 2 additions & 0 deletions Makefile.common
Expand Up @@ -327,10 +327,12 @@ bootstrap-clean:
openblas-clean:
# OpenBLAS make clean actually gives error-messages. Let it do it, but silently
$(MAKE) -C 3rdParty/OpenBLAS-0.2.8 clean > /dev/null 2>&1

clean: qtclean fmil-clean opencl_rt_clean gc-clean lis-clean runtimeCPPclean CMinpack-clean Cdaskr-clean bootstrap-clean msgpack-clean graphstream-clean openblas-clean umfpack-clean
(cd SimulationRuntime/c && $(MAKE) -f $(defaultMakefileTarget) clean)
(cd SimulationRuntime/interactive && $(MAKE) -f $(defaultMakefileTarget) clean)
(cd Compiler && $(MAKE) -f $(defaultMakefileTarget) clean)
(cd Parser && $(MAKE) -f $(defaultMakefileTarget) clean)
(cd mosh/src && $(MAKE) -f $(defaultMakefileTarget) clean)
(cd PythonInterface && $(MAKE) -f $(defaultMakefileTarget) clean)
$(MAKE) -C Compiler/Template -f $(defaultMakefileTarget) clean
Expand Down
21 changes: 11 additions & 10 deletions Parser/Makefile.common
Expand Up @@ -10,7 +10,7 @@ RMLINC = -I$(RMLHOME)/include/plain


.PHONY: all
.SUFFIXES: .c .o
.SUFFIXES: .h .c .o
all: install

install: libantlr3.a libomparse.a
Expand Down Expand Up @@ -40,7 +40,12 @@ HFILES = \
OBJS = \
ParModelica_Lexer_BaseModelica_Lexer.o ParModelica_Lexer.o \
MetaModelica_Lexer_BaseModelica_Lexer.o MetaModelica_Lexer.o \
Modelica_3_Lexer_BaseModelica_Lexer.o Modelica_3_Lexer.o
Modelica_3_Lexer_BaseModelica_Lexer.o Modelica_3_Lexer.o \
MetaModelica_Lexer.o MetaModelica_Lexer_BaseModelica_Lexer.o \
Modelica_3_Lexer.o Modelica_3_Lexer_BaseModelica_Lexer.o \
ModelicaParser_omc.o ParModelica_Lexer.o \
ParModelica_Lexer_BaseModelica_Lexer.o \
Parser_omc.o \

ParModelica_Lexer.o: ParModelica_Lexer.h ParModelica_Lexer_BaseModelica_Lexer.h ../Compiler/runtime/errorext.h
MetaModelica_Lexer.o: MetaModelica_Lexer.h MetaModelica_Lexer_BaseModelica_Lexer.h ../Compiler/runtime/errorext.h
Expand All @@ -52,11 +57,11 @@ ModelicaParser_omc.o: ModelicaParser.c ModelicaParser.h ModelicaParserCommon.h .

Parser_omc.o: $(HFILES) parse.c lookupTokenName.c

$(OBJS) ModelicaParser_omc.o: $(HFILES)
$(OBJS) : $(HFILES)

libomparse.a: Parser_omc.o $(OBJS) ModelicaParser_omc.o
libomparse.a: $(OBJS)
rm -f $@
ar -ru $@ Parser_omc.o $(OBJS) ModelicaParser_omc.o
ar -ru $@ $(OBJS)
ranlib $@

parsergen = ModelicaParser.c ModelicaParser.h
Expand Down Expand Up @@ -117,10 +122,6 @@ $(parmodelicagen) : ParModelica_Lexer.stamp
$(MAKE) $<; \
fi


clean:
rm -f *.o *.obj *.lib *.a \
ModelicaParser.c ModelicaParser.h \
*Modelica*_Lexer.c *Modelica*_Lexer.h \
*.tokens *.stamp *.stamp.tmp
rm -f *.o *.obj *.lib *.a *.so ModelicaParser.c ModelicaParser.h *Modelica*_Lexer.c *Modelica*_Lexer.h *.tokens *.stamp *.stamp.tmp
rm -f $(ANTLR)/antlr3config.h

0 comments on commit 4e9e185

Please sign in to comment.