Clean up Makefiles re exported variables.

diff --git a/Makefile b/Makefile
index 5a78334dc6d5da240e784ee006fb0a45c4231217..4c82c635b922d71c13eedb62e3db08c9798baee3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Your C compiler
-#CC=gcc
+CC=gcc
 #CC=clang
 
 # Enable compiler warnings. This is an absolute minimum.
@@ -31,10 +31,11 @@ CFLAGS += -I$(INCLUDEDIR)
 LDFLAGS += -L$(LIBDIR)
 
 RANLIB ?= $(shell which ranlib)
+AR ?= $(shell which ar)
 
 # Choose your sound support
 # OPTIONS: ao, none
-export SOUND ?= ao
+SOUND ?= ao
 
 # Default sample rate for sound effects.
 # All modern sound interfaces can be expected to support 44100 Hz sample
@@ -79,6 +80,23 @@ CURSES ?= -lncurses
 # Under normal circumstances, nothing in this section should be changed.
 #########################################################################
 
+export CC
+export CFLAGS
+export AR
+export RANLIB
+export PREFIX
+export MANDIR
+export SYSCONFDIR
+export INCLUDEDIR
+export LIBDIR
+export SOUND
+export SAMPLERATE
+export BUFFSIZE
+export DEFAULT_CONVERTER
+export COLOR
+export STRRCHR_DEF
+
+
 # Versioning
 MAJOR=2
 MINOR=44

diff --git a/src/curses/Makefile b/src/curses/Makefile
index 136f41294833c85197aa633b63273f1498a68b2c..34ecc798a2ef13f0f20f4f7285b76f7536d5ee73 100644 (file)
--- a/src/curses/Makefile
+++ b/src/curses/Makefile
@@ -28,7 +28,7 @@ endif
 
 $(TARGET): $(OBJECTS)
        $(AR) $(ARFLAGS) $@ $?
-       ranlib $@
+       $(RANLIB) $@
 
 clean:
        rm -f $(TARGET) $(OBJECTS)

diff --git a/src/dumb/Makefile b/src/dumb/Makefile
index 515b8c606267f4b88b2cdf0c81bd37570518465c..952be49d2bdf8da345e5f6e73999b12a8a4a4b94 100644 (file)
--- a/src/dumb/Makefile
+++ b/src/dumb/Makefile
@@ -13,7 +13,7 @@ ARFLAGS = rc
 
 $(TARGET): $(OBJECTS)
        $(AR) $(ARFLAGS) $@ $?
-       ranlib $@
+       $(RANLIB) $@
 
 clean:
        rm -f $(TARGET) $(OBJECTS)

diff --git a/src/sdl/Makefile b/src/sdl/Makefile
index af002d8f03f9fac5de7b945e6c4313f2fb0605ea..49b4d7355a1d9750fa1cc34012122bf4f0f2b7d4 100644 (file)
--- a/src/sdl/Makefile
+++ b/src/sdl/Makefile
@@ -23,7 +23,7 @@ TARGET = frotz_sdl.a
 
 $(TARGET): $(OBJECTS)
        $(AR) $(ARFLAGS) $@ $?
-       ranlib $@
+       $(RANLIB) $@
 
 clean:
        -rm -f $(TARGET) $(OBJECTS) $(DEPS)