Revise GCC Makefile

* Add install target
* Enable out-of-source-builds
* Fix target directory creation

Author: beutlich

.CI/Jenkinsfile

@@ -221,9 +221,8 @@ def makefile(CC, dotest) {
   sh label: "Build makefile $CC", script: """
   export CC=$CC
   rm -rf Modelica/Resources/Library/*
-  mkdir -p "Modelica/Resources/Library/$LIBDIR"
-  cd Modelica/Resources/BuildProjects/gcc
-  make --output-sync -j${numPhysicalCPU()} TARGETDIR="$LIBDIR"
+  cd Modelica/Resources
+  make install -C BuildProjects/gcc --output-sync -j${numPhysicalCPU()} TARGETDIR="$LIBDIR" BUILDDIR="../../build"
   """
   sh label: "Test $CC", script: """
   export CC=$CC

Modelica/Resources/BuildProjects/gcc/Makefile

@@ -1,102 +1,102 @@
+CC ?= cc
 AR = ar -ru
 RM = rm -f
 
+TARGETDIR ?= linux64
+BUILDDIR ?= build
+
+OBJDIR := $(BUILDDIR)/obj
+LIBDIR := $(BUILDDIR)/lib
+
+INSTALLDIR := ../../Library/$(TARGETDIR)
+
 CFLAGS = -O3 -Wno-attributes -fno-delete-null-pointer-checks
 CPPFLAGS = -DNDEBUG -DHAVE_UNISTD_H -DHAVE_STDARG_H -DHAVE_HIDDEN -DHAVE_MEMCPY
-INC = -I"../../C-Sources/zlib"
+INC      = -I"../../C-Sources/zlib"
 
-TARGETDIR = linux64
+SRC := ../../C-Sources
+ZLIBSRC := $(SRC)/zlib
 
 EXTC_OBJS = \
-	ModelicaFFT.o \
-	ModelicaInternal.o \
-	ModelicaRandom.o \
-	ModelicaStrings.o
+	$(OBJDIR)/ModelicaFFT.o \
+	$(OBJDIR)/ModelicaInternal.o \
+	$(OBJDIR)/ModelicaRandom.o \
+	$(OBJDIR)/ModelicaStrings.o
 
 TABLES_OBJS = \
-	ModelicaStandardTables.o \
-	ModelicaStandardTablesUsertab.o
+	$(OBJDIR)/ModelicaStandardTables.o \
+	$(OBJDIR)/ModelicaStandardTablesUsertab.o
 
 MATIO_OBJS = \
-	ModelicaMatIO.o \
-	snprintf.o
+	$(OBJDIR)/ModelicaMatIO.o \
+	$(OBJDIR)/snprintf.o
 
 IO_OBJS = \
-	ModelicaIO.o
+	$(OBJDIR)/ModelicaIO.o
 
 ZLIB_OBJS = \
-	adler32.o \
-	compress.o \
-	crc32.o \
-	deflate.o \
-	gzclose.o \
-	gzlib.o \
-	gzread.o \
-	gzwrite.o \
-	infback.o \
-	inffast.o \
-	inflate.o \
-	inftrees.o \
-	trees.o \
-	uncompr.o \
-	zutil.o
-
-ALL_OBJS = $(EXTC_OBJS) $(TABLES_OBJS) $(MATIO_OBJS) $(IO_OBJS) $(ZLIB_OBJS)
-
-all: clean
-	$(MAKE) libModelicaExternalC.a libModelicaStandardTables.a libModelicaIO.a libModelicaMatIO.a libzlib.a
-
-libModelicaExternalC.a: $(EXTC_OBJS)
-	$(AR) $@ $(EXTC_OBJS)
-	cp $@ ../../Library/$(TARGETDIR)/$@
-
-libModelicaStandardTables.a: $(TABLES_OBJS)
-	$(AR) $@ $(TABLES_OBJS)
-	cp $@ ../../Library/$(TARGETDIR)/$@
-
-libModelicaMatIO.a: $(MATIO_OBJS)
-	$(AR) $@ $(MATIO_OBJS)
-	cp $@ ../../Library/$(TARGETDIR)/$@
-
-libModelicaIO.a: $(IO_OBJS)
-	$(AR) $@ $(IO_OBJS)
-	cp $@ ../../Library/$(TARGETDIR)/$@
-
-libzlib.a: $(ZLIB_OBJS)
-	$(AR) $@ $(ZLIB_OBJS)
-	cp $@ ../../Library/$(TARGETDIR)/$@
-
-ModelicaStandardTables.o: ../../C-Sources/ModelicaStandardTables.c
-	$(CC) $(CPPFLAGS) -DTABLE_SHARE=1 $(CFLAGS) $(INC) -c -o $@ $<
+	$(OBJDIR)/adler32.o \
+	$(OBJDIR)/compress.o \
+	$(OBJDIR)/crc32.o \
+	$(OBJDIR)/deflate.o \
+	$(OBJDIR)/gzclose.o \
+	$(OBJDIR)/gzlib.o \
+	$(OBJDIR)/gzread.o \
+	$(OBJDIR)/gzwrite.o \
+	$(OBJDIR)/infback.o \
+	$(OBJDIR)/inffast.o \
+	$(OBJDIR)/inflate.o \
+	$(OBJDIR)/inftrees.o \
+	$(OBJDIR)/trees.o \
+	$(OBJDIR)/uncompr.o \
+	$(OBJDIR)/zutil.o
+
+LIBS = \
+	$(LIBDIR)/libModelicaExternalC.a \
+	$(LIBDIR)/libModelicaStandardTables.a \
+	$(LIBDIR)/libModelicaIO.a \
+	$(LIBDIR)/libModelicaMatIO.a \
+	$(LIBDIR)/libzlib.a
+
+.PHONY: all install clean
+
+all: $(LIBS)
+
+install: all | $(INSTALLDIR)
+	cp $(LIBDIR)/*.a $(INSTALLDIR)/
 
-ModelicaStandardTablesUsertab.o: ../../C-Sources/ModelicaStandardTablesUsertab.c
-	$(CC) $(CPPFLAGS) -DDUMMY_FUNCTION_USERTAB $(CFLAGS) $(INC) -c -o $@ $<
+clean:
+	$(RM) -r $(BUILDDIR)
 
-ModelicaMatIO.o: ../../C-Sources/ModelicaMatIO.c
-	$(CC) $(CPPFLAGS) -DHAVE_ZLIB=1 $(CFLAGS) $(INC) -c -o $@ $<
+$(OBJDIR) $(LIBDIR) $(INSTALLDIR):
+	mkdir -p $@
 
-snprintf.o: ../../C-Sources/snprintf.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -c -o $@ $<
+$(LIBDIR)/libModelicaExternalC.a: $(EXTC_OBJS) | $(LIBDIR)
+	$(AR) $@ $^
 
-ModelicaIO.o: ../../C-Sources/ModelicaIO.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -c -o $@ $<
+$(LIBDIR)/libModelicaStandardTables.a: $(TABLES_OBJS) | $(LIBDIR)
+	$(AR) $@ $^
 
-ModelicaFFT.o: ../../C-Sources/ModelicaFFT.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -c -o $@ $<
+$(LIBDIR)/libModelicaMatIO.a: $(MATIO_OBJS) | $(LIBDIR)
+	$(AR) $@ $^
 
-ModelicaInternal.o: ../../C-Sources/ModelicaInternal.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -c -o $@ $<
+$(LIBDIR)/libModelicaIO.a: $(IO_OBJS) | $(LIBDIR)
+	$(AR) $@ $^
 
-ModelicaRandom.o: ../../C-Sources/ModelicaRandom.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -c -o $@ $<
+$(LIBDIR)/libzlib.a: $(ZLIB_OBJS) | $(LIBDIR)
+	$(AR) $@ $^
 
-ModelicaStrings.o: ../../C-Sources/ModelicaStrings.c
+$(OBJDIR)/%.o: $(SRC)/%.c | $(OBJDIR)
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -c -o $@ $<
 
-%.o: ../../C-Sources/zlib/%.c
+$(OBJDIR)/%.o: $(ZLIBSRC)/%.c | $(OBJDIR)
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -c -o $@ $<
 
-clean:
-	$(RM) $(ALL_OBJS)
-	$(RM) *.a
-	$(RM) ../../Library/$(TARGETDIR)/*.a
+$(OBJDIR)/ModelicaStandardTables.o: $(SRC)/ModelicaStandardTables.c | $(OBJDIR)
+	$(CC) $(CPPFLAGS) -DTABLE_SHARE=1 $(CFLAGS) $(INC) -c -o $@ $<
+
+$(OBJDIR)/ModelicaStandardTablesUsertab.o: $(SRC)/ModelicaStandardTablesUsertab.c | $(OBJDIR)
+	$(CC) $(CPPFLAGS) -DDUMMY_FUNCTION_USERTAB $(CFLAGS) $(INC) -c -o $@ $<
+
+$(OBJDIR)/ModelicaMatIO.o: $(SRC)/ModelicaMatIO.c | $(OBJDIR)
+	$(CC) $(CPPFLAGS) -DHAVE_ZLIB=1 $(CFLAGS) $(INC) -c -o $@ $<