[Pkg-electronics-commits] [gnucap] 19/43: plugpath-4: config.h conflict fix, revert main/Make2*
felix salfelder
felix-guest at moszumanska.debian.org
Wed Oct 4 03:21:45 UTC 2017
This is an automated email from the git hooks/post-receive script.
felix-guest pushed a commit to branch master
in repository gnucap.
commit ed82143d5653d2bcd379207b6b4b78155d443b4b
Author: al davis <ad211 at freeelectron.net>
Date: Sat Apr 15 22:56:27 2017 -0400
plugpath-4: config.h conflict fix, revert main/Make2*
Fixes a conflict where main/config.h could block include/config.h,
by using explicit "./config.h" for main and reverting main/Make2*
to no longer search -I.. .
---
include/Make.depend | 0
include/md.h | 8 ++++----
include/patchlev.h | 2 +-
main/Make.depend | 2 +-
main/Make2.Debug | 10 ++++------
main/Make2.g++ | 4 +---
main/Make2.mingw32 | 4 +---
main/configure | 6 ++----
main/main.cc | 9 +--------
9 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/include/Make.depend b/include/Make.depend
deleted file mode 100644
index e69de29..0000000
diff --git a/include/md.h b/include/md.h
index 3d10600..afaec04 100644
--- a/include/md.h
+++ b/include/md.h
@@ -27,7 +27,7 @@
/*--------------------------------------------------------------------------*/
/* autoconf stuff */
#ifdef HAVE_CONFIG_H
-//#include "config.h"
+#include "config.h"
#endif
/*--------------------------------------------------------------------------*/
/* std collection of includes */
@@ -76,13 +76,13 @@ enum {
#if defined(__WIN32__)
#define ENDDIR "/\\"
#define PATHSEP ';'
+#define STEPFILE "/tmp/SXXXXXX"
#define SHELL OS::getenv("COMSPEC")
-#define STEPFILE "/tmp/SXXXXXX"
#else
#define ENDDIR "/"
#define PATHSEP ':'
-#define SHELL OS::getenv("SHELL")
-#define STEPFILE "/tmp/SXXXXXX"
+#define STEPFILE "/tmp/SXXXXXX"
+#define SHELL OS::getenv("SHELL")
#endif
/*--------------------------------------------------------------------------*/
/* machine and compiler patches */
diff --git a/include/patchlev.h b/include/patchlev.h
index ff0c271..d8bff9c 100644
--- a/include/patchlev.h
+++ b/include/patchlev.h
@@ -1 +1 @@
-#define PATCHLEVEL "plugpath-3c 2017.04.11"
+#define PATCHLEVEL "plugpath-4 2017.04.15"
diff --git a/main/Make.depend b/main/Make.depend
index 8989850..bdea9c8 100644
--- a/main/Make.depend
+++ b/main/Make.depend
@@ -1,4 +1,4 @@
-main.o: main.cc ../config.h ../include/globals.h ../include/l_dispatcher.h \
+main.o: main.cc config.h ../include/globals.h ../include/l_dispatcher.h \
../include/e_base.h ../include/md.h ../include/io_trace.h \
../include/io_error.h ../include/l_stlextra.h ../include/u_opt.h \
../include/mode.h ../include/io_.h ../include/l_lib.h ../include/ap.h \
diff --git a/main/Make2.Debug b/main/Make2.Debug
index 2aa6331..7deeaa6 100644
--- a/main/Make2.Debug
+++ b/main/Make2.Debug
@@ -27,7 +27,7 @@ VPATH = .:..
CCC = g++
CCFLAGS = \
--DUNIX -g -O0 -I. -I.. -I../../include -DTRACE_UNTESTED \
+-DUNIX -g -O0 -I. -I../../include -DTRACE_UNTESTED \
-Wall -Wextra \
-Wswitch-enum -Wundef -Wpointer-arith -Woverloaded-virtual \
-Wcast-qual -Wcast-align -Wpacked -Wshadow -Wconversion \
@@ -42,15 +42,13 @@ LIBS = \
LDFLAGS = -rdynamic \
-L../../lib/O-DEBUG
-CONF_CPPFLAGS=-DHAVE_CONFIG_H
-
-.SUFFIXES:
+%.SUFFIXES:
.SUFFIXES: .o .cc
-.cc.o:; $(CCC) $(CXXFLAGS) $(CONF_CPPFLAGS) $(CPPFLAGS) $(CCFLAGS) -c $<
+.cc.o:; $(CCC) $(CCFLAGS) -c $<
#------------------------------------------------------------------------
$(TARGET): $(TARGET_DEPENDS)
rm -f $@
- $(CCC) $(CXXFLAGS) $(CPPFLAGS) $(CCFLAGS) $(OBJS) -o $@ $(LIBS) $(LDFLAGS)
+ $(CCC) $(CCFLAGS) $(OBJS) $(LIBS) $(LDFLAGS) -o $@
#------------------------------------------------------------
# warnings turned off, because they warn of nothing wrong
# 4.3
diff --git a/main/Make2.g++ b/main/Make2.g++
index 394fca4..8991962 100644
--- a/main/Make2.g++
+++ b/main/Make2.g++
@@ -34,11 +34,9 @@ LIBS = \
LDFLAGS = -rdynamic \
-L../../lib/O
-CONF_CPPFLAGS=-DGNUCAP_PLUGPATH=\"$(PREFIX)/lib/gnucap\"
-
.SUFFIXES:
.SUFFIXES: .o .cc
-.cc.o:; $(CCC) $(CXXFLAGS) $(CONF_CPPFLAGS) $(CPPFLAGS) $(CCFLAGS) -c $<
+.cc.o:; $(CCC) $(CCFLAGS) -c $<
#------------------------------------------------------------------------
$(TARGET): $(TARGET_DEPENDS)
rm -f $@
diff --git a/main/Make2.mingw32 b/main/Make2.mingw32
index b718444..b6150e6 100644
--- a/main/Make2.mingw32
+++ b/main/Make2.mingw32
@@ -32,11 +32,9 @@ LIBS = -lgnucap
LDFLAGS = -L../../lib/MSW
-CONF_CPPFLAGS=-DGNUCAP_PLUGPATH=\"$(PREFIX)/lib/gnucap\"
-
.SUFFIXES:
.SUFFIXES: .o .cc
-.cc.o:; $(CCC) $(CXXFLAGS) $(CONF_CPPFLAGS) $(CPPFLAGS) $(CCFLAGS) -c $<
+.cc.o:; $(CCC) $(CCFLAGS) -c $<
#------------------------------------------------------------------------
$(TARGET): $(TARGET)$(TARGET_EXT)
#------------------------------------------------------------------------
diff --git a/main/configure b/main/configure
index b9be87f..66668bd 100755
--- a/main/configure
+++ b/main/configure
@@ -46,7 +46,7 @@ fill_template gnucap-conf
chmod +x gnucap-conf
#----------------------------------------------------------------
echo "CCFLAGS = \\" >Make.ccflags
-echo "-DUNIX -O2 -DNDEBUG -I. -I.. -I../include -I../../include -W" >>Make.ccflags
+echo "-DUNIX -O2 -DNDEBUG -I. -I../include -I../../include -W" >>Make.ccflags
echo "LIBS = \\" >Make.libs
echo "-lgnucap \\" >>Make.libs
@@ -63,10 +63,8 @@ TARGET_EXT =
LDFLAGS = -rdynamic \
-L../../lib/O
-CONF_CPPFLAGS=-DHAVE_CONFIG_H
-
.SUFFIXES : .o .cc
-.cc.o:; \$(CCC) \$(CXXFLAGS) \$(CONF_CPPFLAGS) \$(CPPFLAGS) \$(CCFLAGS) -c \$<
+.cc.o:; \$(CCC) \$(CXXFLAGS) \$(CPPFLAGS) \$(CCFLAGS) -c \$<
#------------------------------------------------------------------------
\$(TARGET): \$(OBJS)
rm -f \$@
diff --git a/main/main.cc b/main/main.cc
index 6373990..01e2156 100644
--- a/main/main.cc
+++ b/main/main.cc
@@ -23,6 +23,7 @@
* it all starts here
*/
//testing=script 2006.07.14
+#include "config.h"
#include "globals.h"
#include "u_prblst.h"
#include "u_sim_data.h"
@@ -33,14 +34,6 @@
#include "c_comand.h"
#include "declare.h" /* plclose */
/*--------------------------------------------------------------------------*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-/*--------------------------------------------------------------------------*/
-#ifndef GNUCAP_PLUGPATH
-//# define GNUCAP_PLUGPATH "/usr/local/lib/gnucap"
-#endif
-/*--------------------------------------------------------------------------*/
struct JMP_BUF{
sigjmp_buf p;
} env;
--
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