[rott-commits] r257 - in trunk/rott: . audiolib

[DONOTREPLY at icculus.org]

Author: fabian
Date: 2011-04-18 07:51:03 -0400 (Mon, 18 Apr 2011)
New Revision: 257

Modified:
   trunk/rott/Makefile
   trunk/rott/audiolib/Makefile
Log:
Completely overhaul the Makefile.

Modified: trunk/rott/Makefile
===================================================================
--- trunk/rott/Makefile	2011-01-10 08:47:32 UTC (rev 256)
+++ trunk/rott/Makefile	2011-04-18 11:51:03 UTC (rev 257)
@@ -1,86 +1,87 @@
-#-----------------------------------------------------------------------------#
-# ROTT makefile.
-#-----------------------------------------------------------------------------#
+BINARY ?= rott
 
-CC = gcc
+CFLAGS += $(shell sdl-config --cflags)
+CFLAGS += -g
+CFLAGS += -Wall
+CFLAGS += -Wno-unused
+CFLAGS += $(EXTRACFLAGS)
 
-CFLAGS += -g -W -Wall -Wno-unused
+CPPFLAGS += -DUSE_SDL=1
+CPPFLAGS += -DUSE_EXECINFO=1
+CPPFLAGS += -DPLATFORM_UNIX=1
+CPPFLAGS += $(EXTRACPPFLAGS)
+
 LDFLAGS += -Wl,-E
+LDFLAGS += $(EXTRALDFLAGS)
 
-SDL_CFLAGS := $(shell sdl-config --cflags)
-SDL_LDFLAGS := $(shell sdl-config --libs) -lSDL_mixer
+LDLIBS += $(shell sdl-config --libs)
+LDLIBS += -lSDL_mixer
+LDLIBS += $(EXTRALDLIBS)
 
-ALL_CFLAGS = $(SDL_CFLAGS) -DUSE_SDL=1 -DUSE_EXECINFO=1 -DPLATFORM_UNIX=1 $(CFLAGS) $(EXTRACFLAGS)
-LDLIBS = $(LDFLAGS) $(SDL_LDFLAGS) $(EXTRALDFLAGS)
+OBJS :=
+OBJS += cin_actr.o
+OBJS += cin_efct.o
+OBJS += cin_evnt.o
+OBJS += cin_glob.o
+OBJS += cin_main.o
+OBJS += cin_util.o
+OBJS += dosutil.o
+OBJS += engine.o
+OBJS += isr.o
+OBJS += modexlib.o
+OBJS += rt_actor.o
+OBJS += rt_battl.o
+OBJS += rt_build.o
+OBJS += rt_cfg.o
+OBJS += rt_crc.o
+OBJS += rt_com.o
+OBJS += rt_debug.o
+OBJS += rt_dmand.o
+OBJS += rt_door.o
+OBJS += rt_draw.o
+OBJS += rt_floor.o
+OBJS += rt_game.o
+OBJS += rt_in.o
+OBJS += rt_main.o
+OBJS += rt_map.o
+OBJS += rt_menu.o
+OBJS += rt_msg.o
+OBJS += rt_net.o
+OBJS += rt_playr.o
+OBJS += rt_rand.o
+OBJS += rt_scale.o
+OBJS += rt_sound.o
+OBJS += rt_spbal.o
+OBJS += rt_sqrt.o
+OBJS += rt_stat.o
+OBJS += rt_state.o
+OBJS += rt_str.o
+OBJS += rt_swift.o
+OBJS += rt_ted.o
+OBJS += rt_util.o
+OBJS += rt_view.o
+OBJS += rt_vid.o
+OBJS += rt_err.o
+OBJS += scriplib.o
+OBJS += w_wad.o
+OBJS += watcom.o
+OBJS += z_zone.o
+OBJS += byteordr.o
+OBJS += dukemusc.o
+OBJS += winrott.o
 
-%.o: %.c
-	$(CC) $(ALL_CFLAGS) -c $< -o $@
+AUDIOLIB := audiolib/audiolib.a
 
-all: rott
+all: $(BINARY)
 
-audiolib/audiolib.a:
-	$(MAKE) -C audiolib CC="$(CC)" CFLAGS="$(ALL_CFLAGS)" LDLIBS="$(LDLIBS)"
+$(BINARY): $(OBJS) $(AUDIOLIB)
+	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
-OBJS = \
-	cin_actr.o \
-	cin_efct.o \
-	cin_evnt.o \
-	cin_glob.o \
-	cin_main.o \
-	cin_util.o \
-	dosutil.o \
-	engine.o \
-	isr.o \
-	modexlib.o \
-	rt_actor.o \
-	rt_battl.o \
-	rt_build.o \
-	rt_cfg.o \
-	rt_crc.o \
-	rt_com.o \
-	rt_debug.o \
-	rt_dmand.o \
-	rt_door.o \
-	rt_draw.o \
-	rt_floor.o \
-	rt_game.o \
-	rt_in.o \
-	rt_main.o \
-	rt_map.o \
-	rt_menu.o \
-	rt_msg.o \
-	rt_net.o \
-	rt_playr.o \
-	rt_rand.o \
-	rt_scale.o \
-	rt_sound.o \
-	rt_spbal.o \
-	rt_sqrt.o \
-	rt_stat.o \
-	rt_state.o \
-	rt_str.o \
-	rt_swift.o \
-	rt_ted.o \
-	rt_util.o \
-	rt_view.o \
-	rt_vid.o \
-	rt_err.o \
-	scriplib.o \
-	w_wad.o \
-	watcom.o \
-	z_zone.o \
-	byteordr.o \
-	dukemusc.o \
-	winrott.o
-
 $(OBJS): develop.h
-rott: $(OBJS) audiolib/audiolib.a
-	$(CC) $^ $(LDLIBS) -o $@
 
-clean:
+$(AUDIOLIB):
+	$(MAKE) -C audiolib CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)"
+
+clean distclean:
 	$(MAKE) -C audiolib clean
-	rm -f rott rott.exe *.o
-
-distclean: clean
-	$(MAKE) -C audiolib distclean
-	rm -f *~
+	rm -f $(OBJS) $(BINARY) $(BINARY).exe

Modified: trunk/rott/audiolib/Makefile
===================================================================
--- trunk/rott/audiolib/Makefile	2011-01-10 08:47:32 UTC (rev 256)
+++ trunk/rott/audiolib/Makefile	2011-04-18 11:51:03 UTC (rev 257)
@@ -1,22 +1,29 @@
-CC=gcc
-AR=ar
-RANLIB=ranlib
-CFLAGS=-g -O2
-LDLIBS=
+AUDIOLIB ?= audiolib.a
 
 CFLAGS += $(shell sdl-config --cflags)
+
 LDLIBS += $(shell sdl-config --libs)
+LDLIBS += -lSDL_mixer
 
-OBJ=fx_man.o dsl.o ll_man.o multivoc.o mv_mix.o mvreverb.o nodpmi.o \
-	pitch.o user.o usrhooks.o
+AR ?= ar
+RANLIB ?= ranlib
 
-audiolib.a: $(OBJ)
-	rm -rf $@
+OBJS :=
+OBJS += fx_man.o
+OBJS += dsl.o
+OBJS += ll_man.o
+OBJS += multivoc.o
+OBJS += mv_mix.o
+OBJS += mvreverb.o
+OBJS += nodpmi.o
+OBJS += pitch.o
+OBJS += user.o
+OBJS += usrhooks.o
+
+$(AUDIOLIB): $(OBJS)
+	rm -f $@
 	$(AR) rc $@ $^
 	$(RANLIB) $@
 
-clean:
-	rm -rf audiolib.a *.o
-
-distclean: clean
-	rm -rf *~
+clean distclean:
+	rm -f $(AUDIOLIB) $(OBJS)