コミット: c3df886263a6a4a2f4f65cb2047e9588e0b08739 - Saffron (git)

Graphics library for Mercury, including OpenGL bindings, TGA image reading, and X11, Win32, and SDL2 windowing and input.

コミットメタ情報

• リビジョン: c3df886263a6a4a2f4f65cb2047e9588e0b08739 (tree)
• 日時: 2022-06-03 00:16:13
• 作者: AlaskanEmily <emily@alas...>
• コミッター: AlaskanEmily

ログメッセージ

Some cleanups in Unix makefile

変更サマリ

• modified: makefile

差分

--- a/makefile
+++ b/makefile
@@ -1,17 +1,21 @@
 # Unix makefile to build Saffron.
 # Needs GNU Make or BSD Make.
 
-CC?=gcc
 CFLAGS?=-O1 -g
 MMC?=mmc
 SO?=so
-MMC_OPTS?=--use-grade-subdirs --intermodule-optimization -O 7 --output-compile-error-lines 1024 --c-include-dir /usr/X11R6/include --c-include-dir /usr/local/include -L /usr/X11R6/lib -L /usr/local/lib --cflag -g --ld-flag -g
-GRADE_OPT=`if test ! -z '$(GRADE)' ; then echo ' --grade=$(GRADE)' ; fi`
-PARALLEL_OPT=`if test ! -z '$(PARALLEL)' ; then echo ' -j $(PARALLEL)' ; fi`
+ROOT!=pwd
+MMC_EXTRA_FLAGS1!=uname | egrep -v 'BSD$$' >/dev/null || echo ' --c-include-dir /usr/X11R6/include -L /usr/X11R6/include'
+MMC_EXTRA_FLAGS2!=uname | fgrep Linux >/dev/null || echo ' --c-include-dir /usr/local/include -L /usr/local/include'
+MMC_OPTS?=--use-grade-subdirs --intermodule-optimization -O 7 --output-compile-error-lines 1024 $(MMC_EXTRA_FLAGS1) $(MMC_EXTRA_FLAGS2) --cflag -g --ld-flag -g
+GRADE_OPT!=test -z '$(GRADE)' || echo ' --grade=$(GRADE)'
+PARALLEL_OPT!=test -z '$(PARALLEL)' || echo ' -j $(PARALLEL)'
 SAFFRON_MMC_OPTS=$(MMC_OPTS) $(GRADE_OPT) $(PARALLEL_OPT)
 SHARED_MMC_FLAGS=--linkage shared --lib-linkage shared
 STATIC_MMC_FLAGS=--linkage static --lib-linkage static
 AWK?=awk
+CC!=$(MMC) $(SAFFRON_MMC_OPTS) --output-cc
+CFLAGS!=$(MMC) $(SAFFRON_MMC_OPTS) --output-cflags
 
 ALL=build_saffron
 all: $(ALL)
@@ -22,24 +26,24 @@ utils: $(UTILS)
 DEMOS=build_saffron_cube_demo
 demos: $(DEMOS)
 
-MMATH_LINK_FLAGS=--search-lib-files-dir "$$ROOT/mmath" --init-file "$$ROOT/mmath/mmath.init"
+MMATH_LINK_FLAGS=--search-lib-files-dir '$(ROOT)/mmath' --init-file '$(ROOT)/mmath/mmath.init'
 # Used for utils, tests, and demos. That's why it requires the ROOT variable to be set in shell.
-SAFFRON_LINK_FLAGS=--search-lib-files-dir "$$ROOT" --init-file "$$ROOT/saffron.init"
-GLOW_INCLUDE_FLAGS=--c-include-dir "$$ROOT/glow"
+SAFFRON_LINK_FLAGS=--search-lib-files-dir '$(ROOT)' --init-file '$(ROOT)/saffron.init'
+GLOW_INCLUDE_FLAGS=--c-include-dir '$(ROOT)/glow'
 # Transunit, used for testing.
-TRANSUNIT_LINK_FLAGS=--search-lib-files-dir "$$ROOT/test/transunit" --init-file "$$ROOT/test/transunit/transunit.init" --link-object "$$ROOT/test/transunit/libtransunit.a"
+TRANSUNIT_LINK_FLAGS=--search-lib-files-dir '$(ROOT)/test/transunit' --init-file '$(ROOT)/test/transunit/transunit.init' --link-object '$(ROOT)/test/transunit/libtransunit.a'
 # TGA, used for some demos and has its own tests.
-SAFFRON_TGA_LINK_FLAGS=--search-lib-files-dir "$$ROOT/util/tga" --init-file "$$ROOT/util/tga/saffron_tga.init"
-SAFFRON_GLOW_LINK_FLAGS=--search-lib-files-dir "$$ROOT/util/glow" --init-file "$$ROOT/util/glow/saffron_glow.init" $(GLOW_INCLUDE_FLAGS)
-SAFFRON_WINDOW_LINK_FLAGS=--search-lib-files-dir "$$ROOT/util/window" --init-file "$$ROOT/util/window/saffron_window.init"
+SAFFRON_TGA_LINK_FLAGS=--search-lib-files-dir '$(ROOT)/util/tga' --init-file '$(ROOT)/util/tga/saffron_tga.init'
+SAFFRON_GLOW_LINK_FLAGS=--search-lib-files-dir '$(ROOT)/util/glow' --init-file '$(ROOT)/util/glow/saffron_glow.init' $(GLOW_INCLUDE_FLAGS)
+SAFFRON_WINDOW_LINK_FLAGS=--search-lib-files-dir '$(ROOT)/util/window' --init-file '$(ROOT)/util/window/saffron_window.init'
 
 # Generated source.
 saffron.gl.buffer.inc: saffron.gl_gen.awk saffron.gl.buffer.csv
-	$(AWK) -F, -f saffron.gl_gen.awk < saffron.gl.buffer.csv > '$@'
+	$(AWK) -F, -f saffron.gl_gen.awk saffron.gl.buffer.csv > '$@'
 	@touch saffron.gl.buffer.m # Force the Mercury compiler to rebuild this...
 
 saffron.gl.shader.inc: saffron.gl_gen.awk saffron.gl.shader.csv
-	$(AWK) -F, -f saffron.gl_gen.awk < saffron.gl.shader.csv > '$@'
+	$(AWK) -F, -f saffron.gl_gen.awk saffron.gl.shader.csv > '$@'
 	@touch saffron.gl.shader.m # Force the Mercury compiler to rebuild this...
 
 # Primary libraries.
@@ -48,7 +52,7 @@ saffron.gl.shader.inc: saffron.gl_gen.awk saffron.gl.shader.csv
 libsaffron.$(SO): build_saffron
 build_saffron: build_mmath saffron.gl.buffer.inc saffron.gl.shader.inc
 	ROOT=`pwd` && $(MMC) $(SAFFRON_MMC_OPTS) $(MMATH_LINK_FLAGS) --make libsaffron $(STATIC_MMC_FLAGS)
-	ROOT=`pwd` && $(MMC) $(SAFFRON_MMC_OPTS) $(MMATH_LINK_FLAGS) --make libsaffron $(SHARED_MMC_FLAGS) -L "$$ROOT/mmath" -lmmath -lGL -lX11
+	ROOT=`pwd` && $(MMC) $(SAFFRON_MMC_OPTS) $(MMATH_LINK_FLAGS) --make libsaffron $(SHARED_MMC_FLAGS) -L '$(ROOT)/mmath' -lmmath -lGL -lX11
 	install libsaffron.$(SO) demo/
 	install libsaffron.$(SO) test/
 
@@ -59,8 +63,8 @@ build_mmath:
 	install mmath/libmmath.$(SO) demo/
 	install mmath/libmmath.$(SO) test/
 
-CLEAN_LIB=for X in "$$ROOT/$$DIR"/*.err "$$ROOT/$$DIR"/*.mh "$$ROOT/$$DIR"/*.init "$$ROOT/$$DIR"/*.a "$$ROOT/$$DIR"/*.so "$$ROOT/$$DIR"/*.dylib "$$ROOT/$$DIR"/*.lib "$$ROOT/$$DIR"/*.dll ; do if test -f "$$X" || test -h "$$X" ; then rm "$$X" ; fi ; done
-CLEAN_MERCURY=cd "$$ROOT/$$DIR" && $(MMC) $(SAFFRON_MMC_OPTS) $(SAFFRON_LINK_FLAGS) --make "$$TARGET".clean ; $(CLEAN_LIB)
+CLEAN_LIB=for X in "$(ROOT)/$$DIR"/*.err "$(ROOT)/$$DIR"/*.mh "$(ROOT)/$$DIR"/*.init "$(ROOT)/$$DIR"/*.a "$(ROOT)/$$DIR"/*.so "$(ROOT)/$$DIR"/*.dylib "$(ROOT)/$$DIR"/*.lib "$(ROOT)/$$DIR"/*.dll ; do if test -f "$$X" || test -h "$$X" ; then rm "$$X" ; fi ; done
+CLEAN_MERCURY=cd "$(ROOT)/$$DIR" && $(MMC) $(SAFFRON_MMC_OPTS) $(SAFFRON_LINK_FLAGS) --make "$$TARGET".clean ; $(CLEAN_LIB)
 
 #Utils
 glow/libglow.$(SO): build_glow
@@ -71,70 +75,71 @@ build_glow:
 
 util/glow/libsaffron_glow.$(SO): build_saffron_glow
 build_saffron_glow: build_glow build_saffron_window build_saffron
-	ROOT=`pwd` && cd util/glow && $(MMC) $(SAFFRON_MMC_OPTS) $(MMATH_LINK_FLAGS) $(SAFFRON_LINK_FLAGS) $(SAFFRON_WINDOW_LINK_FLAGS) $(GLOW_INCLUDE_FLAGS) --make libsaffron_glow $(STATIC_MMC_FLAGS) 
-	ROOT=`pwd` && cd util/glow && $(MMC) $(SAFFRON_MMC_OPTS) $(MMATH_LINK_FLAGS) $(SAFFRON_LINK_FLAGS) $(SAFFRON_WINDOW_LINK_FLAGS) $(GLOW_INCLUDE_FLAGS) --make libsaffron_glow $(SHARED_MMC_FLAGS) -L "$$ROOT/util/window" -lsaffron_window -L "$$ROOT" -lsaffron -L "$$ROOT/glow" -lglow -l GL -l X11
+	cd util/glow && $(MMC) $(SAFFRON_MMC_OPTS) $(MMATH_LINK_FLAGS) $(SAFFRON_LINK_FLAGS) $(SAFFRON_WINDOW_LINK_FLAGS) $(GLOW_INCLUDE_FLAGS) --make libsaffron_glow $(STATIC_MMC_FLAGS) 
+	cd util/glow && $(MMC) $(SAFFRON_MMC_OPTS) $(MMATH_LINK_FLAGS) $(SAFFRON_LINK_FLAGS) $(SAFFRON_WINDOW_LINK_FLAGS) $(GLOW_INCLUDE_FLAGS) --make libsaffron_glow $(SHARED_MMC_FLAGS) -L '$(ROOT)/util/window' -lsaffron_window -L '$(ROOT)' -lsaffron -L '$(ROOT)/glow' -lglow -l GL -l X11
 	install util/glow/libsaffron_glow.$(SO) demo/
 	install util/glow/libsaffron_glow.$(SO) test/
 
 util/window/libsaffron_window.$(SO): build_saffron_window
 build_saffron_window:
-	ROOT=`pwd` && cd util/window && $(MMC) $(SAFFRON_MMC_OPTS) $(MMATH_LINK_FLAGS) $(SAFFRON_LINK_FLAGS) --make libsaffron_window $(STATIC_MMC_FLAGS)
-	ROOT=`pwd` && cd util/window && $(MMC) $(SAFFRON_MMC_OPTS) $(MMATH_LINK_FLAGS) $(SAFFRON_LINK_FLAGS) --make libsaffron_window $(SHARED_MMC_FLAGS)
+	cd util/window && $(MMC) $(SAFFRON_MMC_OPTS) $(MMATH_LINK_FLAGS) $(SAFFRON_LINK_FLAGS) --make libsaffron_window $(STATIC_MMC_FLAGS)
+	cd util/window && $(MMC) $(SAFFRON_MMC_OPTS) $(MMATH_LINK_FLAGS) $(SAFFRON_LINK_FLAGS) --make libsaffron_window $(SHARED_MMC_FLAGS)
 	install util/window/libsaffron_window.$(SO) demo/
 	install util/window/libsaffron_window.$(SO) test/
 
 build_saffron_tga:
-	ROOT=`pwd` && cd util/tga && $(MMC) $(SAFFRON_MMC_OPTS) --make libsaffron_tga $(STATIC_MMC_FLAGS)
+	cd util/tga && $(MMC) $(SAFFRON_MMC_OPTS) --make libsaffron_tga $(STATIC_MMC_FLAGS)
 
 # Demos
 
 # Shared resources between demos and test.
 # All of these are copied from the test directory to the demo directory.
 demo/res/crate.tga: test/res/tga/crate.tga
-	cp "$<" demo/res/
+	cp '$<' demo/res/
 
 demo/res/ctc24.tga: test/res/tga/ctc24.tga
-	cp "$<" demo/res/
+	cp '$<' demo/res/
 
 build_saffron_cube_demo: demo/res/crate.tga build_saffron build_saffron_tga build_saffron_window build_saffron_glow
-	ROOT=`pwd` && cd demo && $(MMC) $(SAFFRON_MMC_OPTS) -E --make saffron_cube_demo $(MMATH_LINK_FLAGS) $(SAFFRON_LINK_FLAGS) $(SAFFRON_GLOW_LINK_FLAGS) $(SAFFRON_WINDOW_LINK_FLAGS) $(SAFFRON_TGA_LINK_FLAGS) -L "$$ROOT/glow" -lglow -lX11 -lmmath -lsaffron -lsaffron_window -lsaffron_glow --link-object "$$ROOT/util/tga/libsaffron_tga.a" -lGL
+	cd demo && $(MMC) $(SAFFRON_MMC_OPTS) -E --make saffron_cube_demo $(MMATH_LINK_FLAGS) $(SAFFRON_LINK_FLAGS) $(SAFFRON_GLOW_LINK_FLAGS) $(SAFFRON_WINDOW_LINK_FLAGS) $(SAFFRON_TGA_LINK_FLAGS) -L '$(ROOT)/glow' -lglow -lX11 -lmmath -lsaffron -lsaffron_window -lsaffron_glow --link-object '$(ROOT)/util/tga/libsaffron_tga.a' -lGL
 
 # Testing
 build_transunit:
 	cd test/transunit && $(MMC) $(SAFFRON_MMC_OPTS) --make libtransunit $(STATIC_MMC_FLAGS)
 
 test_saffron_tga: build_transunit build_saffron_tga
-	ROOT=`pwd` && cd test && $(MMC) $(SAFFRON_MMC_OPTS) --make saffron_tga_test $(TRANSUNIT_LINK_FLAGS) $(SAFFRON_TGA_LINK_FLAGS)
-	ROOT=`pwd` && cd test/res/tga && "$$ROOT/test/saffron_tga_test"
+	cd test && $(MMC) $(SAFFRON_MMC_OPTS) --make saffron_tga_test $(TRANSUNIT_LINK_FLAGS) $(SAFFRON_TGA_LINK_FLAGS)
+	cd test/res/tga && "$(ROOT)/test/saffron_tga_test"
 
 # Clean
 clean_mmath:
-	ROOT=`pwd` ; DIR=mmath ; TARGET=mmath ; $(CLEAN_MERCURY)
+	DIR=mmath ; TARGET=mmath ; $(CLEAN_MERCURY)
 
 clean_saffron:
-	ROOT=`pwd` ; DIR=. ; TARGET=saffron ; $(CLEAN_MERCURY)
+	DIR='$(ROOT)' ; TARGET=saffron ; $(CLEAN_MERCURY)
 
 clean_glow:
-	ROOT=`pwd` ; DIR=glow ; $(CLEAN_LIB)
+	DIR=glow ; $(CLEAN_LIB)
+	rm -f glow/*.o glow/*.os
 
 clean_saffron_glow:
-	ROOT=`pwd` ; DIR=util/glow ; TARGET=saffron_glow ; $(CLEAN_MERCURY)
+	DIR=util/glow ; TARGET=saffron_glow ; $(CLEAN_MERCURY)
 
 clean_saffron_tga:
-	ROOT=`pwd` ; DIR=util/tga ; TARGET=saffron_tga ; $(CLEAN_MERCURY)
+	DIR=util/tga ; TARGET=saffron_tga ; $(CLEAN_MERCURY)
 
 clean_saffron_window:
-	ROOT=`pwd` ; DIR=util/window ; TARGET=saffron_wingow ; $(CLEAN_MERCURY)
+	DIR=util/window ; TARGET=saffron_wingow ; $(CLEAN_MERCURY)
 
 clean_test_saffron_tga:
-	ROOT=`pwd` ; DIR=test ; TARGET=test_saffron_tga ; $(CLEAN_MERCURY)
+	DIR=test ; TARGET=test_saffron_tga ; $(CLEAN_MERCURY)
 
 clean_saffron_cube_demo:
-	ROOT=`pwd` ; DIR=demo ; TARGET=saffron_cube_demo ; $(CLEAN_MERCURY)
+	DIR=demo ; TARGET=saffron_cube_demo ; $(CLEAN_MERCURY)
 
-CLEAN=clean_mmath clean_saffron clean_saffron_glow clean_saffron_window clean_saffron_tga clean_glow clean_test_saffron_tga clean_saffron_cube_demo
+CLEAN=clean_mmath clean_saffron clean_glow clean_saffron_glow clean_saffron_window clean_saffron_tga clean_glow clean_test_saffron_tga clean_saffron_cube_demo
 clean: $(CLEAN)
-	rm -f demo/lib*.$(SO) # Remove the demo libraries we copied.
+	rm -f demo/res/crate.tga demo/res/ctc24.tga demo/lib*.$(SO) # Remove the demo libraries we copied.
 
 .IGNORE: $(CLEAN)
 .PHONY: all demos test utils $(ALL) build_mmath $(UTILS) build_saffron_tga build_saffron_window build_glow build_saffron_glow build_saffron_cube_demo build_test_saffron_tga $(DEMOS) $(CLEAN)