# HG changeset patch # User William Pitcock # Date 1187464714 18000 # Node ID d603becf76e08035d5a45396f193cb4b603a45b9 # Parent acd3b3d8d2cbf43a617c6ab6b0ec7e2cbdc537cb# Parent 47612fdac429f5199510532f4c55b30b9719a282 Automated merge with ssh://hg.atheme.org//hg/audacious-plugins diff -r 47612fdac429 -r d603becf76e0 mk/objective.mk --- a/mk/objective.mk Sat Aug 18 01:03:35 2007 +0200 +++ b/mk/objective.mk Sat Aug 18 14:18:34 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 \