From a4c818bb049ccbf3b69a59dd1a2c4d5c9e161bf4 Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Mon, 11 Feb 2008 15:43:09 +0000 Subject: [PATCH] include Makefile.defs in dependencies git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@716 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- core/Makefile | 6 +++--- core/plug-in/Makefile.app_module | 8 ++++---- core/plug-in/Makefile.audio_module | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/Makefile b/core/Makefile index b668fbfe..e16a414d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -62,13 +62,13 @@ LDFLAGS +=-lsamplerate endif # implicit rules -%.o : %.cpp %.d +%.o : %.cpp %.d ../Makefile.defs $(CXX) -c -o $@ $< $(CPPFLAGS) $(CXXFLAGS) -%.d : %.cpp %.h Makefile +%.d : %.cpp %.h Makefile ../Makefile.defs $(CXX) -MM $< $(CPPFLAGS) $(CXXFLAGS) > $@ -$(NAME): $(NAME).o $(OBJS) +$(NAME): $(NAME).o $(OBJS) ../Makefile.defs $(LD) -o $(NAME) $(NAME).o $(OBJS) $(LDFLAGS) install: all mk-install-dirs \ diff --git a/core/plug-in/Makefile.app_module b/core/plug-in/Makefile.app_module index 8ad24493..4d6595ca 100644 --- a/core/plug-in/Makefile.app_module +++ b/core/plug-in/Makefile.app_module @@ -77,16 +77,16 @@ $(plug_in_name)_audio: $(audio-prefix)/$(audio-dir) done -%.d: %.cpp Makefile $(COREPATH)/plug-in/Makefile.app_module +%.d: %.cpp Makefile $(COREPATH)/plug-in/Makefile.app_module $(COREPATH)/../Makefile.defs $(CXX) -MM $< $(CXXFLAGS) $(CPPFLAGS) > $@ -%.d: %.c Makefile $(COREPATH)/plug-in/Makefile.app_module +%.d: %.c Makefile $(COREPATH)/plug-in/Makefile.app_module $(COREPATH)/../Makefile.defs $(CC) -MM $< $(CFLAGS) $(CPPFLAGS) > $@ -%.o: %.cpp %.d +%.o: %.cpp %.d $(COREPATH)/../Makefile.defs $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ -%.o: %.c %.d +%.o: %.c %.d $(COREPATH)/../Makefile.defs $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ diff --git a/core/plug-in/Makefile.audio_module b/core/plug-in/Makefile.audio_module index d1eddc24..09f46ff2 100644 --- a/core/plug-in/Makefile.audio_module +++ b/core/plug-in/Makefile.audio_module @@ -37,10 +37,10 @@ install: $(lib_name) $(extra_install) .PHONY: install-cfg install-cfg : $(extra_install_cfg) -%.d: %.c Makefile $(COREPATH)/plug-in/Makefile.audio_module +%.d: %.c Makefile $(COREPATH)/plug-in/Makefile.audio_module $(COREPATH)/../Makefile.defs $(CC) -MM $< $(CPPFLAGS) $(CFLAGS) > $@ -%.o: %.c %.d +%.o: %.c %.d $(COREPATH)/../Makefile.defs $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ $(lib_full_name): $(lib_name)