Mercurial > audlegacy-plugins

changeset 1505:acd3b3d8d2cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sync with audacious Mk.
author William Pitcock <nenolod@atheme-project.org>
date Sat, 18 Aug 2007 14:18:15 -0500
parents 45e2325fd07f
children d603becf76e0
files mk/objective.mk
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mk/objective.mk	Fri Aug 17 11:58:12 2007 -0500
+++ b/mk/objective.mk	Sat Aug 18 14:18:15 2007 -0500
@@ -126,9 +126,10 @@
 	@if [ -f Makefile.in ]; then \
 		rm -f Makefile; \
 	fi
-	@if [ -f mk/rules.mk ]; then \
+	@if [ -f mk/rules.mk.in ]; then \
 		rm -f mk/rules.mk; \
 	fi
+	rm -f config.log config.status
 
 build: depend
 	$(MAKE) build-prehook
@@ -208,7 +209,7 @@
 	fi;
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-$(OBJECTIVE_LIBS): $(OBJECTS) $(LIBDEP)
+$(OBJECTIVE_LIBS): $(OBJECTS)
 	if [ "x$(OBJECTS)" != "x" ]; then \
 		$(MAKE) $(OBJECTS) || exit;		\
 		printf "%10s     %-20s\n" LINK $@; \
@@ -230,7 +231,7 @@
 		$(AR) cr $@ $(OBJECTS); \
 	fi
 
-$(OBJECTIVE_BINS): $(OBJECTS) $(LIBDEP)
+$(OBJECTIVE_BINS): $(OBJECTS)
 	if [ "x$(OBJECTS)" != "x" ]; then \
 		$(MAKE) $(OBJECTS) || exit;		\
 		printf "%10s     %-20s\n" LINK $@; \
@@ -251,11 +252,13 @@
 		echo "[complete]"; \
 	fi
 
-.PHONY: .depend depend clean distclean
+.PHONY: .depend depend depend-prehook clean distclean
 .depend:
+depend-prehook:
 
 # default depend rule. if something else is needed -- override depend target
 depend:
+	$(MAKE) depend-prehook
 	@if [ "x$(SUBDIRS)" != "x" ]; then \
 		for i in $(SUBDIRS); do \
 			if [ $(VERBOSITY) -gt 0 ]; then \