[Pkg-electronics-commits] [gnucap] 08/49: Bugfix .. Make2.*, configure Mingw still not working.
felix salfelder
felix-guest at moszumanska.debian.org
Tue Feb 2 21:39:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
felix-guest pushed a commit to branch wip
in repository gnucap.
commit 2d23910fca87a5f38f1465e14f4f029682c754ff
Author: al davis <al at floyd.freeelectron.net>
Date: Fri Jul 4 11:24:20 2014 -0400
Bugfix .. Make2.*, configure
Mingw still not working.
---
apps/Make2.Debug | 6 +++---
apps/Make2.g++ | 8 +++-----
apps/configure | 15 ++-------------
include/patchlev.h | 2 +-
lib/Make2.Debug | 3 ++-
lib/Make2.g++ | 4 ++--
main/Make2.Debug | 4 +---
main/Make2.g++ | 4 +---
main/configure | 8 ++++----
modelgen/Make2.Debug | 4 +---
modelgen/Make2.g++ | 4 +---
modelgen/configure | 8 ++++----
12 files changed, 25 insertions(+), 45 deletions(-)
diff --git a/apps/Make2.Debug b/apps/Make2.Debug
index d698580..2180461 100644
--- a/apps/Make2.Debug
+++ b/apps/Make2.Debug
@@ -1,4 +1,4 @@
-#$Id: Make2.Debug,v 26.138 2013/04/24 02:44:30 al Exp $ -*- Makefile -*-
+#$Id: Make2.Debug 2014/07/03 al $ -*- Makefile -*-
# Copyright (C) 2001 Albert Davis
# Author: Albert Davis <aldavis at gnu.org>
#
@@ -25,6 +25,7 @@ VPATH = .:..
# Running the program will give a spew of line markers for debugging.
CCC = g++
+TARGET_EXT = .so
CCFLAGS = \
-fPIC \
@@ -39,7 +40,6 @@ CCFLAGS = \
#last line not in 4.1
LIBS = \
--lreadline -ltermcap \
LDFLAGS = -shared
@@ -47,7 +47,7 @@ LDFLAGS = -shared
.SUFFIXES: .o .cc
.cc.o:; $(CCC) $(CCFLAGS) -c $<
#------------------------------------------------------------------------
-$(TARGET): $(TARGET_DEPENDS)
+$(TARGET)$(TARGET_EXT): $(TARGET_DEPENDS)
rm -f $@
$(CCC) $(CCFLAGS) $(OBJS) $(LIBS) $(LDFLAGS) -o $@
#------------------------------------------------------------
diff --git a/apps/Make2.g++ b/apps/Make2.g++
index 813f82a..c7581c9 100644
--- a/apps/Make2.g++
+++ b/apps/Make2.g++
@@ -1,4 +1,4 @@
-#$Id: Make2.g++,v 26.138 2013/04/24 02:44:30 al Exp $ -*- Makefile -*-
+#$Id: Make2.g++ 2014/07/03 al $ -*- Makefile -*-
# Copyright (C) 2001 Albert Davis
# Author: Albert Davis <aldavis at gnu.org>
#
@@ -24,15 +24,13 @@ VPATH = .:..
# Standard base for g++.
CCC = g++
+TARGET_EXT = .so
CCFLAGS = \
-fPIC \
--DHAVE_LIBREADLINE \
-DUNIX -O3 -DNDEBUG -I. -I../include -I../../include -W
LIBS = \
--lreadline -ltermcap \
-
LDFLAGS = -shared
@@ -40,7 +38,7 @@ LDFLAGS = -shared
.SUFFIXES: .o .cc
.cc.o:; $(CCC) $(CCFLAGS) -c $<
#------------------------------------------------------------------------
-$(TARGET): $(TARGET_DEPENDS)
+$(TARGET)$(TARGET_EXT): $(TARGET_DEPENDS)
rm -f $@
$(CCC) $(CCFLAGS) $(OBJS) $(LIBS) $(LDFLAGS) -o $@
#------------------------------------------------------------
diff --git a/apps/configure b/apps/configure
index e39f96f..76e8220 100755
--- a/apps/configure
+++ b/apps/configure
@@ -25,20 +25,9 @@ sed -e "s#/usr/local#$prefix#" ../Makefile.template > Makefile
#----------------------------------------------------------------
echo "CCFLAGS = -fPIC \\" >Make.ccflags
-echo "LIBS = \\" >Make.libs
-
-rm -f a.out
-g++ -lreadline -ltermcap test_readline.cc
-if [ -f a.out ] ; then
- echo "using readline"
- echo "-DHAVE_LIBREADLINE \\" >>Make.ccflags
- echo "-lreadline -ltermcap \\" >>Make.libs
-else
- echo "either libtermcap or libreadline is missing - not using readline"
-fi
-rm -f a.out
-
echo "-DUNIX -O2 -DNDEBUG -I. -I../include -I../../include -W" >>Make.ccflags
+
+echo "LIBS = \\" >Make.libs
echo "" >>Make.libs
echo "PREFIX = " $prefix >>Make.libs
echo "" >>Make.libs
diff --git a/include/patchlev.h b/include/patchlev.h
index 1d945dc..8b4fec4 100644
--- a/include/patchlev.h
+++ b/include/patchlev.h
@@ -1 +1 @@
-#define PATCHLEVEL "2013.04.23 RCS 26.138"
+#define PATCHLEVEL "2014-07-03 bugfix-WIP"
diff --git a/lib/Make2.Debug b/lib/Make2.Debug
index ef56364..c101c0d 100644
--- a/lib/Make2.Debug
+++ b/lib/Make2.Debug
@@ -1,4 +1,4 @@
-#$Id: Make2.Debug,v 26.138 2013/04/24 03:03:11 al Exp $ -*- Makefile -*-
+#$Id: Make2.Debug 2014/07/03 al $ -*- Makefile -*-
# Copyright (C) 2001 Albert Davis
# Author: Albert Davis <aldavis at gnu.org>
#
@@ -41,6 +41,7 @@ CCFLAGS = \
LIBS = \
-lreadline -ltermcap \
+-ldl
LDFLAGS = -shared
diff --git a/lib/Make2.g++ b/lib/Make2.g++
index 963f453..7dd1598 100644
--- a/lib/Make2.g++
+++ b/lib/Make2.g++
@@ -1,4 +1,4 @@
-#$Id: Make2.g++,v 26.138 2013/04/24 03:03:11 al Exp $ -*- Makefile -*-
+#$Id: Make2.g++ 2014/07/03 al $ -*- Makefile -*-
# Copyright (C) 2001 Albert Davis
# Author: Albert Davis <aldavis at gnu.org>
#
@@ -33,7 +33,7 @@ CCFLAGS = \
LIBS = \
-lreadline -ltermcap \
-
+-ldl
LDFLAGS = -shared
diff --git a/main/Make2.Debug b/main/Make2.Debug
index 1438d8d..7deeaa6 100644
--- a/main/Make2.Debug
+++ b/main/Make2.Debug
@@ -1,4 +1,4 @@
-#$Id: Make2.Debug,v 26.138 2013/04/24 03:32:53 al Exp $ -*- Makefile -*-
+#$Id: Make2.Debug 2014/07/03 al $ -*- Makefile -*-
# Copyright (C) 2001 Albert Davis
# Author: Albert Davis <aldavis at gnu.org>
#
@@ -27,7 +27,6 @@ VPATH = .:..
CCC = g++
CCFLAGS = \
--DHAVE_LIBREADLINE \
-DUNIX -g -O0 -I. -I../../include -DTRACE_UNTESTED \
-Wall -Wextra \
-Wswitch-enum -Wundef -Wpointer-arith -Woverloaded-virtual \
@@ -39,7 +38,6 @@ CCFLAGS = \
LIBS = \
-lgnucap \
--lreadline -ltermcap
LDFLAGS = -rdynamic \
-L../../lib/O-DEBUG
diff --git a/main/Make2.g++ b/main/Make2.g++
index 5814824..8991962 100644
--- a/main/Make2.g++
+++ b/main/Make2.g++
@@ -1,4 +1,4 @@
-#$Id: Make2.g++,v 26.138 2013/04/24 03:32:53 al Exp $ -*- Makefile -*-
+#$Id: Make2.g++ 2014/07/03 al $ -*- Makefile -*-
# Copyright (C) 2001 Albert Davis
# Author: Albert Davis <aldavis at gnu.org>
#
@@ -26,12 +26,10 @@ VPATH = .:..
CCC = g++
CCFLAGS = \
--DHAVE_LIBREADLINE \
-DUNIX -O3 -DNDEBUG -I. -I../include -I../../include -W
LIBS = \
-lgnucap \
--lreadline -ltermcap
LDFLAGS = -rdynamic \
-L../../lib/O
diff --git a/main/configure b/main/configure
index 2408157..f377fe4 100755
--- a/main/configure
+++ b/main/configure
@@ -2,7 +2,6 @@
# configure for executable
mkdir -p O
-
#------------- Stuff added to enable --prefix --------------
if test "x$1" != "x"; then
# echo Found input parameter -- $1
@@ -26,10 +25,10 @@ sed -e "s#/usr/local#$prefix#" ../Makefile.template > Makefile
#----------------------------------------------------------------
echo "CCFLAGS = \\" >Make.ccflags
+echo "-DUNIX -O2 -DNDEBUG -I. -I../include -I../../include -W" >>Make.ccflags
+
echo "LIBS = \\" >Make.libs
echo "-lgnucap \\" >>Make.libs
-
-echo "-DUNIX -O2 -DNDEBUG -I. -I../include -I../../include -W" >>Make.ccflags
echo "" >>Make.libs
echo "PREFIX = " $prefix >>Make.libs
echo "" >>Make.libs
@@ -53,6 +52,7 @@ LDFLAGS = -rdynamic \
CAT_EOF
cat Make.ccflags Make.libs Make.sys >Make2
-cat Make1 Make2 ../Make3 Make.depend >O/Makefile
+rm Make.ccflags Make.libs Make.sys
+#cat Make1 Make2 ../Make3 Make.depend >O/Makefile
exit 0
diff --git a/modelgen/Make2.Debug b/modelgen/Make2.Debug
index d3477fe..7deeaa6 100644
--- a/modelgen/Make2.Debug
+++ b/modelgen/Make2.Debug
@@ -1,4 +1,4 @@
-#$Id: Make2.Debug,v 26.138 2013/04/24 03:21:58 al Exp $ -*- Makefile -*-
+#$Id: Make2.Debug 2014/07/03 al $ -*- Makefile -*-
# Copyright (C) 2001 Albert Davis
# Author: Albert Davis <aldavis at gnu.org>
#
@@ -27,7 +27,6 @@ VPATH = .:..
CCC = g++
CCFLAGS = \
--DHAVE_LIBREADLINE \
-DUNIX -g -O0 -I. -I../../include -DTRACE_UNTESTED \
-Wall -Wextra \
-Wswitch-enum -Wundef -Wpointer-arith -Woverloaded-virtual \
@@ -39,7 +38,6 @@ CCFLAGS = \
LIBS = \
-lgnucap \
--lreadline -ltermcap
LDFLAGS = -rdynamic \
-L../../lib/O-DEBUG
diff --git a/modelgen/Make2.g++ b/modelgen/Make2.g++
index 0eff15b..8991962 100644
--- a/modelgen/Make2.g++
+++ b/modelgen/Make2.g++
@@ -1,4 +1,4 @@
-#$Id: Make2.g++,v 26.138 2013/04/24 03:21:58 al Exp $ -*- Makefile -*-
+#$Id: Make2.g++ 2014/07/03 al $ -*- Makefile -*-
# Copyright (C) 2001 Albert Davis
# Author: Albert Davis <aldavis at gnu.org>
#
@@ -26,12 +26,10 @@ VPATH = .:..
CCC = g++
CCFLAGS = \
--DHAVE_LIBREADLINE \
-DUNIX -O3 -DNDEBUG -I. -I../include -I../../include -W
LIBS = \
-lgnucap \
--lreadline -ltermcap
LDFLAGS = -rdynamic \
-L../../lib/O
diff --git a/modelgen/configure b/modelgen/configure
index 2408157..f377fe4 100755
--- a/modelgen/configure
+++ b/modelgen/configure
@@ -2,7 +2,6 @@
# configure for executable
mkdir -p O
-
#------------- Stuff added to enable --prefix --------------
if test "x$1" != "x"; then
# echo Found input parameter -- $1
@@ -26,10 +25,10 @@ sed -e "s#/usr/local#$prefix#" ../Makefile.template > Makefile
#----------------------------------------------------------------
echo "CCFLAGS = \\" >Make.ccflags
+echo "-DUNIX -O2 -DNDEBUG -I. -I../include -I../../include -W" >>Make.ccflags
+
echo "LIBS = \\" >Make.libs
echo "-lgnucap \\" >>Make.libs
-
-echo "-DUNIX -O2 -DNDEBUG -I. -I../include -I../../include -W" >>Make.ccflags
echo "" >>Make.libs
echo "PREFIX = " $prefix >>Make.libs
echo "" >>Make.libs
@@ -53,6 +52,7 @@ LDFLAGS = -rdynamic \
CAT_EOF
cat Make.ccflags Make.libs Make.sys >Make2
-cat Make1 Make2 ../Make3 Make.depend >O/Makefile
+rm Make.ccflags Make.libs Make.sys
+#cat Make1 Make2 ../Make3 Make.depend >O/Makefile
exit 0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gnucap.git
More information about the Pkg-electronics-commits
mailing list