diff options
| author | Tim Edwards <tim@opencircuitdesign.com> | 2015-07-25 09:26:22 -0400 |
|---|---|---|
| committer | Tim Edwards <tim@opencircuitdesign.com> | 2015-07-25 09:26:22 -0400 |
| commit | dc6458c5b78ae99b413405836812dbad41485c1c (patch) | |
| tree | f607ffe2c306c171c060fad73f7f1492b457aaeb /src | |
| parent | fa8067f0f7d290fe98a1355f3c487d7526f395e8 (diff) | |
Oops, last change defined hash.o and readliberty.o in such a way
that the makefile attempts to turn them into executables. Fixed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 16 | ||||
| -rw-r--r-- | src/Makefile.in | 16 |
2 files changed, 18 insertions, 14 deletions
diff --git a/src/Makefile b/src/Makefile index ec43c3c..dde2cba 100644 --- a/src/Makefile +++ b/src/Makefile @@ -21,7 +21,9 @@ HAVE_ABC = @HAVE_ABC@ HAVE_YOSYS = 1 HAVE_ODIN_II = @HAVE_ODIN_II@ -OBJECTS = blif2BSpice.o blif2Verilog.o blifFanout.o vesta.o hash.o readliberty.o +OBJECTS = blif2BSpice.o blif2Verilog.o blifFanout.o vesta.o +HASHLIB = hash.o +LIBERTYLIB = readliberty.o SOURCES := $(patsubst %.o,%.c,$(OBJECTS)) TARGETS := $(patsubst %.o,%$(EXEEXT),$(OBJECTS)) @@ -32,14 +34,14 @@ all: $(TARGETS) blif2BSpice$(EXEEXT): blif2BSpice.o $(CC) $(LDFLAGS) blif2BSpice.o -o $@ $(LIBS) -blifFanout$(EXEEXT): blifFanout.o hash.o readliberty.o - $(CC) $(LDFLAGS) blifFanout.o hash.o readliberty.o -o $@ $(LIBS) -lm +blifFanout$(EXEEXT): blifFanout.o $(HASHLIB) $(LIBERTYLIB) + $(CC) $(LDFLAGS) blifFanout.o $(DEPENDS) -o $@ $(LIBS) -lm blif2Verilog$(EXEEXT): blif2Verilog.o $(CC) $(LDFLAGS) blif2Verilog.o -o $@ $(LIBS) -vesta$(EXEEXT): vesta.o hash.o - $(CC) $(LDFLAGS) vesta.o hash.o -o $@ $(LIBS) +vesta$(EXEEXT): vesta.o $(HASHLIB) + $(CC) $(LDFLAGS) vesta.o $(HASHLIB) -o $@ $(LIBS) install: $(TARGETS) @echo "Installing verilog and BDNET file format handlers" @@ -62,11 +64,11 @@ uninstall: $(RM) -rf ${BININSTALL} clean: - $(RM) -f $(OBJECTS) + $(RM) -f $(OBJECTS) $(HASHLIB) $(LIBERTYLIB) $(RM) -f $(TARGETS) veryclean: - $(RM) -f $(OBJECTS) + $(RM) -f $(OBJECTS) $(HASHLIB) $(LIBERTYLIB) $(RM) -f $(TARGETS) .c.o: diff --git a/src/Makefile.in b/src/Makefile.in index 50b4582..7142483 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -21,7 +21,9 @@ HAVE_ABC = @HAVE_ABC@ HAVE_YOSYS = @HAVE_YOSYS@ HAVE_ODIN_II = @HAVE_ODIN_II@ -OBJECTS = blif2BSpice.o blif2Verilog.o blifFanout.o vesta.o hash.o readliberty.o +OBJECTS = blif2BSpice.o blif2Verilog.o blifFanout.o vesta.o +HASHLIB = hash.o +LIBERTYLIB = readliberty.o SOURCES := $(patsubst %.o,%.c,$(OBJECTS)) TARGETS := $(patsubst %.o,%$(EXEEXT),$(OBJECTS)) @@ -32,14 +34,14 @@ all: $(TARGETS) blif2BSpice$(EXEEXT): blif2BSpice.o $(CC) $(LDFLAGS) blif2BSpice.o -o $@ $(LIBS) -blifFanout$(EXEEXT): blifFanout.o hash.o readliberty.o - $(CC) $(LDFLAGS) blifFanout.o hash.o readliberty.o -o $@ $(LIBS) -lm +blifFanout$(EXEEXT): blifFanout.o $(HASHLIB) $(LIBERTYLIB) + $(CC) $(LDFLAGS) blifFanout.o $(DEPENDS) -o $@ $(LIBS) -lm blif2Verilog$(EXEEXT): blif2Verilog.o $(CC) $(LDFLAGS) blif2Verilog.o -o $@ $(LIBS) -vesta$(EXEEXT): vesta.o hash.o - $(CC) $(LDFLAGS) vesta.o hash.o -o $@ $(LIBS) +vesta$(EXEEXT): vesta.o $(HASHLIB) + $(CC) $(LDFLAGS) vesta.o $(HASHLIB) -o $@ $(LIBS) install: $(TARGETS) @echo "Installing verilog and BDNET file format handlers" @@ -62,11 +64,11 @@ uninstall: $(RM) -rf ${BININSTALL} clean: - $(RM) -f $(OBJECTS) + $(RM) -f $(OBJECTS) $(HASHLIB) $(LIBERTYLIB) $(RM) -f $(TARGETS) veryclean: - $(RM) -f $(OBJECTS) + $(RM) -f $(OBJECTS) $(HASHLIB) $(LIBERTYLIB) $(RM) -f $(TARGETS) .c.o: |