[qflow] 09/16: Corrected Makefile.in in the src directory, or else vesta won't compile.

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to tag upstream/1.1.7
in repository qflow.

commit 6d0fd58e4c1ccb39972f0b63ceb0f638c9b79fed
Author: Tim Edwards <tim at opencircuitdesign.com>
Date:   Tue Jun 2 17:46:58 2015 -0400

    Corrected Makefile.in in the src directory, or else vesta won't
    compile.
---
 config.log       | 4 ++--
 config.status    | 4 ++--
 configure        | 8 ++++++--
 configure.in     | 9 +++++++--
 scripts/Makefile | 2 +-
 src/Makefile     | 2 +-
 src/Makefile.in  | 4 ++--
 7 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/config.log b/config.log
index b527bf1..326024c 100644
--- a/config.log
+++ b/config.log
@@ -196,7 +196,7 @@ configure:4043: result: /usr/local/bin/graywolf
 configure:4116: checking for yosys
 configure:4134: found /usr/local/bin/yosys
 configure:4146: result: /usr/local/bin/yosys
-configure:4359: creating ./config.status
+configure:4363: creating ./config.status
 
 ## ---------------------- ##
 ## Running config.status. ##
@@ -312,7 +312,7 @@ RM='rm'
 SHELL='/bin/sh'
 STDLIBS=''
 TCLSH_PATH='tclsh'
-VERSION='1.0'
+VERSION='1.1'
 ac_ct_CC='gcc'
 bindir='${exec_prefix}/bin'
 build='x86_64-unknown-linux-gnu'
diff --git a/config.status b/config.status
index 180eb2b..2b81828 100755
--- a/config.status
+++ b/config.status
@@ -427,7 +427,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/tim/gitsrc/qflow-1.0'
+ac_pwd='/home/tim/gitsrc/qflow-1.1'
 srcdir='.'
 INSTALL='/bin/install -c'
 test -n "$AWK" || AWK=awk
@@ -616,7 +616,7 @@ S["CPPFLAGS"]=""
 S["LDFLAGS"]=""
 S["CFLAGS"]="-g -O2"
 S["CC"]="gcc"
-S["VERSION"]="1.0"
+S["VERSION"]="1.1"
 S["host_os"]="linux-gnu"
 S["host_vendor"]="unknown"
 S["host_cpu"]="x86_64"
diff --git a/configure b/configure
index ed334e5..4ef6947 100755
--- a/configure
+++ b/configure
@@ -4158,6 +4158,10 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+if test "x$prefix" = xNONE ; then
+   prefix=$ac_default_prefix
+fi
+
 
 
 # Check whether --with-libdir was given.
@@ -4167,7 +4171,7 @@ if test "${with_libdir+set}" = set; then :
 
 else
 
-   QFLOW_LIB_DIR=${ac_default_prefix}/share/qflow
+   QFLOW_LIB_DIR=${prefix}/share/qflow
 
 fi
 
@@ -4180,7 +4184,7 @@ if test "${with_bindir+set}" = set; then :
 
 else
 
-   QFLOW_BIN_DIR=${ac_default_prefix}/bin
+   QFLOW_BIN_DIR=${prefix}/bin
 
 fi
 
diff --git a/configure.in b/configure.in
index 18fa76e..3e4cfcc 100644
--- a/configure.in
+++ b/configure.in
@@ -120,20 +120,25 @@ AC_ARG_WITH(yosys,
    AC_PATH_PROG(QFLOW_YOSYS_PATH, yosys, , )])
 AC_DEFINE_UNQUOTED(QFLOW_YOSYS_PATH, "$QFLOW_YOSYS_PATH")
 
+dnl Expand the prefix variable
+if test "x$prefix" = xNONE ; then
+   prefix=$ac_default_prefix
+fi
+
 dnl Target library location
 
 AC_ARG_WITH(libdir,
 [  --with-libdir=DIR			path to qflow runtime files], [
    QFLOW_LIB_DIR=$withval
 ], [
-   QFLOW_LIB_DIR=${ac_default_prefix}/share/qflow
+   QFLOW_LIB_DIR=${prefix}/share/qflow
 ])
 
 AC_ARG_WITH(bindir,
 [  --with-bindir=DIR			path to qflow launch script], [
    QFLOW_BIN_DIR=$withval
 ], [
-   QFLOW_BIN_DIR=${ac_default_prefix}/bin
+   QFLOW_BIN_DIR=${prefix}/bin
 ])
 
 dnl AC_SUBST(QFLOW_YOSYS_PATH)
diff --git a/scripts/Makefile b/scripts/Makefile
index 75d7e36..ae68721 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -9,7 +9,7 @@ LIBS =
 LDFLAGS = 
 INSTALL = /bin/install -c
 
-VERSION = 1.0
+VERSION = 1.1
 
 QFLOW_LIB_DIR = /usr/local/share/qflow
 QFLOW_BIN_DIR = /usr/local/bin
diff --git a/src/Makefile b/src/Makefile
index 3d8f639..380dcc3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,7 +3,7 @@
 #
 
 # Main compiler arguments
-CFLAGS = -g
+CFLAGS = -g -O2
 DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\"
 LIBS = 
 LDFLAGS = 
diff --git a/src/Makefile.in b/src/Makefile.in
index 5cf8d8f..b5cbc35 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -38,8 +38,8 @@ blifFanout$(EXEEXT): blifFanout.o hash.o readliberty.o
 blif2Verilog$(EXEEXT): blif2Verilog.o
 	$(CC) $(LDFLAGS) blif2Verilog.o -o $@ $(LIBS)
 
-vesta$(EXEEXT): vesta.o
-	$(CC) $(LDFLAGS) vesta.o -o $@ $(LIBS)
+vesta$(EXEEXT): vesta.o hash.o
+	$(CC) $(LDFLAGS) vesta.o hash.o -o $@ $(LIBS)
 
 install: $(TARGETS)
 	@echo "Installing verilog and BDNET file format handlers"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qflow.git