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

[DONOTREPLY at icculus.org]

Author: fabian
Date: 2011-04-23 13:48:12 -0400 (Sat, 23 Apr 2011)
New Revision: 259

Modified:
   trunk/rott/Makefile
   trunk/rott/audiolib/Makefile
Log:
Some more fine tuning for the Makefiles (no LDLIBS for a static lib, pass CFLAGS when linking, set CFLAGS to a sane default, etc.)

Modified: trunk/rott/Makefile
===================================================================
--- trunk/rott/Makefile	2011-04-19 07:34:00 UTC (rev 258)
+++ trunk/rott/Makefile	2011-04-23 17:48:12 UTC (rev 259)
@@ -2,11 +2,9 @@
 
 CC ?= gcc
 
+CFLAGS ?= -g -O2
+CFLAGS += -Wall -Wno-unused
 CFLAGS += $(shell sdl-config --cflags)
-CFLAGS += -g
-CFLAGS += -O2
-CFLAGS += -Wall
-CFLAGS += -Wno-unused
 CFLAGS += $(EXTRACFLAGS)
 
 CPPFLAGS += -DUSE_SDL=1
@@ -77,7 +75,7 @@
 all: $(BINARY)
 
 $(BINARY): $(OBJS) $(AUDIOLIB)
-	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 $(OBJS): develop.h
 

Modified: trunk/rott/audiolib/Makefile
===================================================================
--- trunk/rott/audiolib/Makefile	2011-04-19 07:34:00 UTC (rev 258)
+++ trunk/rott/audiolib/Makefile	2011-04-23 17:48:12 UTC (rev 259)
@@ -4,14 +4,10 @@
 CC ?= gcc
 RANLIB ?= ranlib
 
-CFLAGS += $(shell sdl-config --cflags)
-CFLAGS += -g
-CFLAGS += -O2
+CFLAGS ?= -g -O2
 CFLAGS += -Wall
+CFLAGS += $(shell sdl-config --cflags)
 
-LDLIBS += $(shell sdl-config --libs)
-LDLIBS += -lSDL_mixer
-
 OBJS :=
 OBJS += fx_man.o
 OBJS += dsl.o