changeset 1701:6b5dcfe6652b octave-forge

Makefile fixes for *.d files
author adb014
date Wed, 08 Sep 2004 07:41:48 +0000
parents 5908ad49c172
children 411fb819afef
files main/comm/Makefile main/fixed/Makefile
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/main/comm/Makefile	Wed Sep 08 04:54:24 2004 +0000
+++ b/main/comm/Makefile	Wed Sep 08 07:41:48 2004 +0000
@@ -49,7 +49,7 @@
 	$(LN_S) $(GALOISTARGET) $@
 
 ifneq (,$(DEPENDS))
-  include $(DEPENDS)
+  sinclude $(DEPENDS)
 endif
 
 $(SUBDIRS) :
--- a/main/fixed/Makefile	Wed Sep 08 04:54:24 2004 +0000
+++ b/main/fixed/Makefile	Wed Sep 08 07:41:48 2004 +0000
@@ -86,9 +86,12 @@
 MOFLAGS =
 
 .PHONY: all clean count $(SUBDIRS)
+
 .SUFFIXES:
 
-all : $(FIXEDVERTARGET) $(DEPENDS) $(OBJECTS) $(TARGETS) $(SUBDIRS)
+.PRECIOUS: %.d %.o
+
+all : $(TARGETS) $(SUBDIRS)
 
 ifndef OCTAVE_FORGE
 install :
@@ -134,7 +137,7 @@
 	$(LN_S) $(FIXEDTARGET) $@
 
 ifneq (,$(DEPENDS))
-  include $(DEPENDS)
+  sinclude $(DEPENDS)
 endif
 
 $(SUBDIRS) :
@@ -149,7 +152,9 @@
 	$(MKOCTFILE) $(MOFLAGS) $(DEFINES) -M int/fixed.cc; \
 	$(LN_S) $(patsubst %.cc,%.d,$<) $@
 
-fixed-int.o : int/fixed.cc
+fixed-var.d : $(FIXEDVERTARGET)
+
+fixed-int.o : int/fixed.cc fixed-int.d
 	@echo "Compiling $@ from $<"; \
 	$(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c $<; \
 	$(RM) -f $@ ; \
@@ -159,7 +164,7 @@
 	@echo "Depending $<"; \
 	$(MKOCTFILE) $(MOFLAGS) $(DEFINES) -M $<
 
-%.o:%.cc
+%.o:%.cc %.d
 	@echo "Compiling $@"; \
 	$(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c $<