Mercurial > audlegacy

changeset 1214:2de9d9fcdbcf trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] s/$(RM)/rm/ (wtf)
author nenolod
date Wed, 14 Jun 2006 00:49:07 -0700
parents a4782cc65887
children f22bd1fa1579
files ChangeLog mk/objective.mk
diffstat 2 files changed, 24 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jun 14 00:46:51 2006 -0700
+++ b/ChangeLog	Wed Jun 14 00:49:07 2006 -0700
@@ -1,3 +1,12 @@
+2006-06-14 07:46:51 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1340]
+  - no more "none"
+  
+
+  Changes:        Modified:
+  +22 -22         trunk/mk/objective.mk  
+
+
 2006-06-14 07:44:16 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1338]
   - typo, sorry
--- a/mk/objective.mk	Wed Jun 14 00:46:51 2006 -0700
+++ b/mk/objective.mk	Wed Jun 14 00:49:07 2006 -0700
@@ -11,14 +11,14 @@
 VERBOSITY = 0
 SHOW_CFLAGS = 0
 
-ifeq ($(SHOW_CFLAGS),0)
-ifeq ($(V),1)
-SHOW_CFLAGS = 1
-endif
-ifeq ($(VERBOSE),1)
-SHOW_CFLAGS = 1
-endif
-endif
+#ifeq ($(SHOW_CFLAGS),0)
+#ifeq ($(V),1)
+#SHOW_CFLAGS = 1
+#endif
+#ifeq ($(VERBOSE),1)
+#SHOW_CFLAGS = 1
+#endif
+#endif
 
 LIBDIR = $(libdir)
 BINDIR = $(bindir)
@@ -95,20 +95,20 @@
 		done; \
 	fi
 	$(MAKE) clean-posthook
-	$(RM) *.o *.lo *.so *.a *.sl
+	rm *.o *.lo *.so *.a *.sl
 	@if test "x$(OBJECTIVE_BINS)" != "x"; then \
 		for i in $(OBJECTIVE_BINS); do \
-			$(RM) $$i; \
+			rm $$i; \
 		done; \
 	fi
 	@if test "x$(OBJECTIVE_LIBS)" != "x"; then \
 		for i in $(OBJECTIVE_LIBS); do \
-			$(RM) $$i; \
+			rm $$i; \
 		done; \
 	fi
 	@if test "x$(OBJECTIVE_LIBS_NOINST)" != "x"; then \
 		for i in $(OBJECTIVE_LIBS_NOINST); do \
-			$(RM) $$i; \
+			rm $$i; \
 		done; \
 	fi
 	@if test $(VERBOSITY) -gt 0; then \
@@ -125,10 +125,10 @@
 		done; \
 	fi
 	@if test -f Makefile.in; then \
-		$(RM) -f Makefile; \
+		rm -f Makefile; \
 	fi
 	@if test -f mk/rules.mk; then \
-		$(RM) -f mk/rules.mk; \
+		rm -f mk/rules.mk; \
 	fi
 
 build:
@@ -198,7 +198,7 @@
 	fi;
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-%.so: $(OBJECTS)
+%.so $(OBJECTIVE_LIBS): $(OBJECTS)
 	if test "x$(OBJECTS)" != "x"; then \
 		$(MAKE) $(OBJECTS) || exit;		\
 		printf "%10s     %-20s\n" LINK $@; \