Merge pull request #195 from admb-project/admb-12.3pre2

Merge admb-12.3pre2 to master
admb-project · Feb 25, 2021 · 07b69b2 · 07b69b2
2 parents 3ae5b24 + 2db649b
commit 07b69b2
Show file tree

Hide file tree

Showing 55 changed files with 2,990 additions and 740 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/contrib/GNUmakefile b/contrib/GNUmakefile
diff --git a/contrib/Makefile b/contrib/Makefile
@@ -55,8 +55,8 @@ contrib-libs: contrib-ecolib contrib-gdbprintlib contrib-qfclib contrib-statslib
 !ENDIF
 
 contrib-ad2csv:
+	if not exist ..\build\ad2csv md ..\build\ad2csv
 	pushd ad2csv& $(MAKE) /nologo
-	copy ad2csv\ad2csv.exe $(DESTDIR)\bin
 
 contrib-ecolib:
 	pushd ecolib& $(MAKE) /nologo

diff --git a/contrib/ad2csv/GNUmakefile b/contrib/ad2csv/GNUmakefile
@@ -13,16 +13,16 @@ ifeq ($(OS),Windows_NT)
   endif
 endif
 
-OPTION=-f
-
 ifeq ($(CMDSHELL),cmd)
-$(CONTRIB_BIN)\ad2csv.exe: ad2csv.cpp main.cpp
-	..\..\admb.cmd $(OPTION) $^
-	copy ad2csv.exe $@
+$(CONTRIB_BIN)ad2csv.exe: ad2csv.cpp main.cpp
+	..\..\admb.cmd $(OPTION) -c -o ..\..\build\ad2csv\main.obj main.cpp
+	..\..\admb.cmd $(OPTION) -c -o ..\..\build\ad2csv\ad2csv.obj ad2csv.cpp
+	..\..\admb.cmd $(OPTION) -o $@ ..\..\build\ad2csv\ad2csv.obj ..\..\build\ad2csv\main.obj
 else
 $(CONTRIB_BIN)ad2csv: ad2csv.cpp main.cpp
-	../../admb$(EXT) $(OPTION) $^
-	cp ad2csv $@
+	../../admb$(EXT) $(OPTION) -c -o ../../build/ad2csv/ad2csv.obj ad2csv.cpp
+	../../admb$(EXT) $(OPTION) -c -o ../../build/ad2csv/main.obj main.cpp
+	../../admb$(EXT) $(OPTION) -o $@ ../../build/ad2csv/ad2csv.obj ../../build/ad2csv/main.obj
 endif
 
 clean:

diff --git a/contrib/ad2csv/Makefile b/contrib/ad2csv/Makefile
@@ -1,8 +1,12 @@
 all:
 !IF DEFINED(DEBUG)
-	..\..\admb.cmd -g ad2csv.cpp main.cpp
+	..\..\admb.cmd -g -c -o ..\..\build\ad2csv\ad2csv.obj ad2csv.cpp
+	..\..\admb.cmd -g -c -o ..\..\build\ad2csv\main.obj main.cpp
+	..\..\admb.cmd -g -o ..\..\build\admb\bin\ad2csv.exe ..\..\build\ad2csv\ad2csv.obj ..\..\build\ad2csv\main.obj
 !ELSE
-	..\..\admb.cmd ad2csv.cpp main.cpp
+	..\..\admb.cmd -c -o ..\..\build\ad2csv\ad2csv.obj ad2csv.cpp
+	..\..\admb.cmd -c -o ..\..\build\ad2csv\main.obj main.cpp
+	..\..\admb.cmd -o ..\..\build\admb\bin\ad2csv.exe ..\..\build\ad2csv\ad2csv.obj ..\..\build\ad2csv\main.obj
 !ENDIF
 
 clean:

diff --git a/contrib/admb-rules.mak b/contrib/admb-rules.mak
@@ -31,20 +31,16 @@ endif
 
 $(SAFE_PREFIX)%.obj: %.cpp
 ifeq ($(CMDSHELL),cmd)
-	..\..\admb.cmd -c $(OPTION) $<
-	copy $(basename $<).obj "$@"
+	..\..\admb.cmd -c $(OPTION) -o "$@" $<
 else
-	../../admb$(EXT) -c $(OPTION) $<
-	cp $(basename $<).obj $@
+	../../admb$(EXT) -c $(OPTION) -o $@ $<
 endif
 
 $(OPT_PREFIX)%.obj: %.cpp
 ifeq ($(CMDSHELL),cmd)
-	..\..\admb.cmd -c -f $(OPTION) $<
-	copy $(basename $<).obj "$@"
+	..\..\admb.cmd -c -f $(OPTION) -o "$@" $<
 else
-	../../admb$(EXT) -c -f $(OPTION) $<
-	cp $(basename $<).obj $@
+	../../admb$(EXT) -c -f $(OPTION) -o $@ $<
 endif
 
 includes:

diff --git a/contrib/ecolib/Makefile b/contrib/ecolib/Makefile
@@ -41,19 +41,17 @@ all: $(OPT) $(SAF)
 
 $(OPT):: $(@B:contrib-optlp-ecolib-=).cpp
 !IF DEFINED(DEBUG)
-	..\..\admb -c -f $?
+	..\..\admb -c -f -o $@ $?
 !ELSE
-	..\..\admb -c -f -g $?
+	..\..\admb -c -f -g -o $@ $?
 !ENDIF
-	copy $(?:.cpp=.obj) $@
 
 $(SAF):: $(@B:contrib-saflp-ecolib-=).cpp
 !IF DEFINED(DEBUG)
-	..\..\admb -c $?
+	..\..\admb -c -o $@ $?
 !ELSE
-	..\..\admb -c -g $?
+	..\..\admb -c -g -o $@ $?
 !ENDIF
-	copy $(?:.cpp=.obj) $@
 
 includes: $(HEADERS)
 	copy $(HEADERS) $(CONTRIB_INCLUDE)

diff --git a/contrib/gdbprintlib/Makefile b/contrib/gdbprintlib/Makefile
@@ -41,20 +41,17 @@ all: $(OPT) $(SAF)
 
 $(OPT):: $(@B:contrib-optlp-gdbprintlib-=).cpp
 !IF DEFINED(DEBUG)
-	..\..\admb -c -g -f $?
+	..\..\admb -c -g -f -o $@ $?
 !ELSE
-	..\..\admb -c -f $?
+	..\..\admb -c -f -o $@ $?
 !ENDIf
 
-	copy $(?:.cpp=.obj) $@
-
 $(SAF):: $(@B:contrib-saflp-gdbprintlib-=).cpp
 !IF DEFINED(DEBUG)
-	..\..\admb -c -g $?
+	..\..\admb -c -g -o $@ $?
 !ELSE
-	..\..\admb -c $?
+	..\..\admb -c -o $@ $?
 !ENDIf
-	copy $(?:.cpp=.obj) $@
 
 includes: $(HEADERS)
 	for %%a in ($(HEADERS)) do copy %%a $(CONTRIB_INCLUDE)

diff --git a/contrib/qfclib/Makefile b/contrib/qfclib/Makefile
@@ -41,19 +41,17 @@ all: $(OPT) $(SAF)
 
 $(OPT):: $(@B:contrib-optlp-qfclib-=).cpp
 !IF DEFINED(DEBUG)
-	..\..\admb -c -f $?
+	..\..\admb -c -f -o $@ $?
 !ELSE
-	..\..\admb -c -f -g $?
+	..\..\admb -c -f -g -o $@ $?
 !ENDIF
-	copy $(?:.cpp=.obj) $@
 
 $(SAF):: $(@B:contrib-saflp-qfclib-=).cpp
 !IF DEFINED(DEBUG)
-	..\..\admb -c $?
+	..\..\admb -c -o $@ $?
 !ELSE
-	..\..\admb -c -g $?
+	..\..\admb -c -g -o $@ $?
 !ENDIF
-	copy $(?:.cpp=.obj) $@
 
 includes: $(HEADERS)
 	copy $(HEADERS) $(CONTRIB_INCLUDE)

diff --git a/contrib/src/Makefile b/contrib/src/Makefile
@@ -41,19 +41,17 @@ all: $(OPT) $(SAF)
 
 $(OPT):: $(@B:contrib-optlp-src-=).cpp
 !IF DEFINED(DEBUG)
-	..\..\admb -c -f $?
+	..\..\admb -c -f -o $@ $?
 !ELSE
-	..\..\admb -c -f -g $?
+	..\..\admb -c -f -g -o $@ $?
 !ENDIF
-	copy $(?:.cpp=.obj) $@
 
 $(SAF):: $(@B:contrib-saflp-src-=).cpp
 !IF DEFINED(DEBUG)
-	..\..\admb -c $?
+	..\..\admb -c -o $@ $?
 !ELSE
-	..\..\admb -c -g $?
+	..\..\admb -c -g -o $@ $?
 !ENDIF
-	copy $(?:.cpp=.obj) $@
 
 includes: $(HEADERS)
 	copy $(HEADERS) $(CONTRIB_INCLUDE)

diff --git a/contrib/statslib/Makefile b/contrib/statslib/Makefile
@@ -41,21 +41,17 @@ all: $(OPT) $(SAF)
 
 $(OPT):: $(@B:contrib-optlp-statslib-=).cpp
 !IF DEFINED(DEBUG)
-	..\..\admb -c -f $?
+	..\..\admb -c -f -o $@ $?
 !ELSE
-	..\..\admb -c -f -g $?
+	..\..\admb -c -f -g -o $@ $?
 !ENDIF
 
-	copy $(?:.cpp=.obj) $@
-
 $(SAF):: $(@B:contrib-saflp-statslib-=).cpp
 !IF DEFINED(DEBUG)
-	..\..\admb -c $?
+	..\..\admb -c -o $@ $?
 !ELSE
-	..\..\admb -c -g $?
+	..\..\admb -c -g -o $@ $?
 !ENDIF
-	copy $(?:.cpp=.obj) $@
-
 
 includes: $(HEADERS)
 	copy $(HEADERS) $(CONTRIB_INCLUDE)