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

[DONOTREPLY at icculus.org]

Author: fabian
Date: 2011-11-07 04:21:17 -0500 (Mon, 07 Nov 2011)
New Revision: 262

Modified:
   trunk/rott/Makefile
   trunk/rott/audiolib/Makefile
Log:
Since audiolib is only used locally and not distributed, a thin archive should be sufficient. Also, call generic RM in Makefiles.

Modified: trunk/rott/Makefile
===================================================================
--- trunk/rott/Makefile	2011-11-07 09:13:45 UTC (rev 261)
+++ trunk/rott/Makefile	2011-11-07 09:21:17 UTC (rev 262)
@@ -83,4 +83,4 @@
 
 clean:
 	$(MAKE) -C audiolib $@
-	rm -f $(OBJS) $(BINARY) $(BINARY).exe
+	$(RM) $(OBJS) $(BINARY) $(BINARY).exe

Modified: trunk/rott/audiolib/Makefile
===================================================================
--- trunk/rott/audiolib/Makefile	2011-11-07 09:13:45 UTC (rev 261)
+++ trunk/rott/audiolib/Makefile	2011-11-07 09:21:17 UTC (rev 262)
@@ -4,6 +4,7 @@
 CC ?= gcc
 RANLIB ?= ranlib
 
+ARFLAGS ?= rcT
 CFLAGS ?= -g -O2
 CFLAGS += -Wall
 CFLAGS += $(shell sdl-config --cflags)
@@ -21,9 +22,9 @@
 OBJS += usrhooks.o
 
 $(AUDIOLIB): $(OBJS)
-	rm -f $@
-	$(AR) rc $@ $^
+	$(RM) $@
+	$(AR) $(ARFLAGS) $@ $^
 	$(RANLIB) $@
 
 clean:
-	rm -f $(AUDIOLIB) $(OBJS)
+	$(RM) $(AUDIOLIB) $(OBJS)