From 8e8b36ee3629727ba8fd9fc322d38e58fb68f6a1 Mon Sep 17 00:00:00 2001 From: Stephen Williams Date: Tue, 16 Dec 2008 09:05:17 -0800 Subject: [PATCH] Add automatic dependencies to subdirs that lack them. The driver/ and driver-vpi/ directories lacked the -MD method of automatic dependencies. Add it to them. --- driver-vpi/Makefile.in | 16 +++++++++++----- driver/Makefile.in | 18 ++++++++++++------ 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/driver-vpi/Makefile.in b/driver-vpi/Makefile.in index 325dc39f7..9c2427b95 100644 --- a/driver-vpi/Makefile.in +++ b/driver-vpi/Makefile.in @@ -47,7 +47,7 @@ CPPFLAGS = -I. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ -all: iverilog-vpi@EXEEXT@ +all: dep iverilog-vpi@EXEEXT@ check: all @@ -67,15 +67,19 @@ iverilog-vpi@EXEEXT@: $O $(CC) $(LDFLAGS) $O -o iverilog-vpi@EXEEXT@ @EXTRALIBS@ -main.o: main.c config.h - $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/main.c - -config.h: config.h.in +config.h: config.h.in Makefile sed -e 's;@IVLCC@;@CC@;' -e 's;@IVLCXX@;@CXX@;' \ -e 's;@SUFFIX@;$(suffix);g' \ -e 's;@IVLCFLAGS@;@CXXFLAGS@;' \ -e 's;@SHARED@;@shared@;' $< > $@ +dep: + mkdir dep + +%.o: %.c + $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o + mv $*.d dep + # Windows specific... res.o: res.rc windres -i res.rc -o res.o @@ -91,3 +95,5 @@ installdirs: ../mkinstalldirs uninstall: rm -f $(bindir)/iverilog-vpi$(suffix)@EXEEXT@ + +-include $(patsubst %.o, dep/%.d, $O) diff --git a/driver/Makefile.in b/driver/Makefile.in index 2aaf34c7b..e1ec0b169 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -47,7 +47,7 @@ CPPFLAGS = -I. -I.. -I$(srcdir)/.. -I$(srcdir) -DVERSION='"$(VERSION)"' @CPPFLAG CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ -all: iverilog@EXEEXT@ +all: dep iverilog@EXEEXT@ clean: rm -f *.o lexor.c parse.c parse.h parse.output @@ -71,13 +71,17 @@ cflexor.c: cflexor.lex cfparse.h cfparse.c: cfparse.y bison --verbose -t -d -o cfparse.c --name-prefix=cf $(srcdir)/cfparse.y +dep: + mkdir dep -main.o: main.c globals.h ../version.h - $(CC) $(CPPFLAGS) $(CFLAGS) -c -DIVL_ROOT='"@libdir@/ivl$(suffix)"' -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' $(srcdir)/main.c +%.o: %.c + $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o + mv $*.d dep -build_string.o: build_string.c globals.h -cflexor.o: cflexor.c cfparse.h cfparse_misc.h globals.h -cfparse.o: cfparse.c globals.h cfparse_misc.h +main.o: main.c globals.h ../version.h Makefile + $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c -DIVL_ROOT='"@libdir@/ivl$(suffix)"' -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' $(srcdir)/main.c + +cflexor.o: cflexor.c cfparse.h iverilog.ps: $(srcdir)/iverilog.man $(MAN) -t $(srcdir)/iverilog.man > iverilog.ps @@ -119,3 +123,5 @@ installdirs: ../mkinstalldirs uninstall: rm -f $(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@ rm -f $(DESTDIR)$(mandir)/man1/iverilog$(suffix).1 $(DESTDIR)$(prefix)/iverilog$(suffix).pdf + +-include $(patsubst %.o, dep/%.d, $O)