Properly build shared and static versions (were swapped before and th…

…e shared ALSO linked all objects) git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19371 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 2, 2014 · a6d46c6 · a6d46c6
1 parent b03eee1
commit a6d46c6
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/Compiler/boot/Makefile.common b/Compiler/boot/Makefile.common
@@ -96,17 +96,17 @@ $(GEN_DIR)libOpenModelicaCompiler$(SHREXT): $(ALL_OBJECTS)
 
 ifeq ($(STATIC),)
 
+$(GEN_DIR)omc$(EXE_EXT): $(GEN_DIR)libOpenModelicaCompiler$(SHREXT) $(GEN_DIR)_main.o
+	$(CC) $(GEN_DIR)_main.o $(RPATH) $(CFLAGS) $(CPPFLAGS) -o $@ $(LDFLAGS) -lOpenModelicaCompiler
+install: $(GEN_DIR)omc$(EXE_EXT)
+	cp -a $< $(OMHOME)/bin/
+
+else
+
 $(GEN_DIR)omc$(EXE_EXT): $(ALL_OBJECTS) $(GEN_DIR)_main.o
 	$(CC) $(GEN_DIR)_main.o $(RPATH) $(CFLAGS) $(CPPFLAGS) -o $@ $(ALL_OBJECTS) $(LDFLAGS)
 install: $(GEN_DIR)omc$(EXE_EXT) $(GEN_DIR)libOpenModelicaCompiler$(SHREXT)
 	cp -a $(GEN_DIR)omc$(EXE_EXT) $(OMHOME)/bin/
 	cp -a $(GEN_DIR)libOpenModelicaCompiler$(SHREXT) $(OMHOME)/lib/omc/
 
-else
-
-$(GEN_DIR)omc$(EXE_EXT): $(GEN_DIR)libOpenModelicaCompiler$(SHREXT) $(GEN_DIR)_main.o
-	$(CC) $(GEN_DIR)_main.o $(RPATH) $(CFLAGS) $(CPPFLAGS) -o $@ $(LDFLAGS) $(ALL_OBJECTS) -lOpenModelicaCompiler
-install: $(GEN_DIR)omc$(EXE_EXT)
-	cp -a $< $(OMHOME)/bin/
-
 endif