Skip to content

Commit 6bfcc94

Browse files
sethrjsethrj
committed
Revert makefile changes
1 parent e3c5092 commit 6bfcc94

File tree

5 files changed

+38
-29
lines changed

5 files changed

+38
-29
lines changed

‎Examples/Makefile.in

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ endif
117117
# for other C++ compilers
118118
##################################################################
119119

120-
CXX_DLLIBS = #-L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
120+
CPP_DLLIBS = #-L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
121121
-L/usr/local/lib -lg++ -lstdc++ -lgcc
122122

123123
# Solaris workshop 5.0
124-
# CXX_DLLIBS = -L/opt/SUNWspro/lib -lCrun
124+
# CPP_DLLIBS = -L/opt/SUNWspro/lib -lCrun
125125

126126
# Symbols used for using shared libraries
127127
SO= @SO@
@@ -197,7 +197,7 @@ tcl: $(SRCDIR_SRCS)
197197
tcl_cpp: $(SRCDIR_SRCS)
198198
$(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -o $(ICXXSRCS) $(INTERFACEPATH)
199199
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE)
200-
$(TCLCXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CXX_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) $(TCL_LINK)
200+
$(TCLCXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) $(TCL_LINK)
201201

202202
# -----------------------------------------------------------------
203203
# Run Tcl example
@@ -258,7 +258,7 @@ perl5: $(SRCDIR_SRCS)
258258
perl5_cpp: $(SRCDIR_SRCS)
259259
$(SWIG) -perl5 -c++ $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
260260
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PERL5_CCFLAGS) $(PERL5_CCCDLFLAGS) -I$(PERL5_INCLUDE)
261-
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(PERL5_CCDLFLAGS) $(OBJS) $(IOBJS) $(PERL5_LDFLAGS) $(PERL5_DLNK) $(LIBS) $(CXX_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
261+
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(PERL5_CCDLFLAGS) $(OBJS) $(IOBJS) $(PERL5_LDFLAGS) $(PERL5_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
262262

263263
# ----------------------------------------------------------------
264264
# Build a module from existing XS C source code. (ie. from xsubpp).
@@ -348,7 +348,7 @@ python: $(SRCDIR_SRCS)
348348
python_cpp: $(SRCDIR_SRCS)
349349
$(SWIG) -python -c++ $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
350350
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(INCLUDES) $(PYTHON_INCLUDE)
351-
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(PYTHON_DLNK) $(LIBS) $(CXX_DLLIBS) -o $(LIBPREFIX)_$(TARGET)$(PYTHON_SO)
351+
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(PYTHON_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)_$(TARGET)$(PYTHON_SO)
352352

353353
# -----------------------------------------------------------------
354354
# Build statically linked Python interpreter
@@ -453,7 +453,7 @@ endif
453453
octave: $(SRCDIR_SRCS)
454454
$(SWIG) -octave $(SWIGOCTHDROPT) $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
455455
$(CXX) -g -c $(IOCTHEADERS) $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(ICXXSRCS) $(INCLUDES) $(OCTAVE_CXX)
456-
$(CC) -g -c $(CCSHARED) $(CXXFLAGS) $(CFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CSRCS) $(INCLUDES)
456+
$(CC) -g -c $(CCSHARED) $(CPPFLAGS) $(CFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CSRCS) $(INCLUDES)
457457
$(LDSHARED) $(CFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO)
458458

459459
# -----------------------------------------------------------------
@@ -463,7 +463,7 @@ octave: $(SRCDIR_SRCS)
463463
octave_cpp: $(SRCDIR_SRCS)
464464
$(SWIG) -c++ -octave $(SWIGOCTHDROPT) $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
465465
$(CXX) -g -c $(IOCTHEADERS) $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(INCLUDES) $(OCTAVE_CXX)
466-
$(CXXSHARED) -g $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) $(CXX_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO)
466+
$(CXXSHARED) -g $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO)
467467

468468
# -----------------------------------------------------------------
469469
# Running an Octave example
@@ -514,7 +514,7 @@ guile: $(SRCDIR_SRCS)
514514
guile_cpp: $(SRCDIR_SRCS)
515515
$(SWIG) -c++ -guile -Linkage passive $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
516516
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS)
517-
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(GUILE_LIBS) $(LIBS) $(CXX_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
517+
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(GUILE_LIBS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
518518

519519
guile_externalhdr:
520520
$(SWIG) -guile -external-runtime $(TARGET)
@@ -615,7 +615,7 @@ java: $(SRCDIR_SRCS)
615615
java_cpp: $(SRCDIR_SRCS)
616616
$(SWIG) -java -c++ $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
617617
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(JAVACFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JAVA_INCLUDE)
618-
$(JAVACXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CXX_DLLIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO)
618+
$(JAVACXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO)
619619

620620
# ----------------------------------------------------------------
621621
# Compile java files
@@ -682,7 +682,7 @@ ifeq (node,$(JSENGINE))
682682
MAKEFLAGS= $(NODEGYP) --loglevel=silent configure build 1>>/dev/null
683683
else
684684
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(INCLUDES) $(JSINCLUDES)
685-
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(JSDYNAMICLINKING) $(LIBS) $(CXX_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
685+
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(JSDYNAMICLINKING) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
686686

687687
endif
688688

@@ -695,13 +695,13 @@ ifeq (jsc, $(ENGINE))
695695
$(LDSHARED) $(CFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(JSDYNAMICLINKING) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
696696
else # (v8 | node) # v8 and node must be compiled as c++
697697
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(ISRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(INCLUDES) $(JSINCLUDES)
698-
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(JSDYNAMICLINKING) $(LIBS) $(CXX_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
698+
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(JSDYNAMICLINKING) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
699699
endif
700700

701701
javascript_cpp: $(SRCDIR_SRCS) javascript_custom_interpreter
702702
$(SWIG) -javascript -c++ $(SWIGOPT) $(INTERFACEPATH)
703703
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(INCLUDES) $(JSINCLUDES)
704-
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(JSDYNAMICLINKING) $(LIBS) $(CXX_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
704+
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(JSDYNAMICLINKING) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
705705

706706
# -----------------------------------------------------------------
707707
# Running a Javascript example
@@ -835,7 +835,7 @@ mzscheme: $(SRCDIR_SRCS)
835835
mzscheme_cpp: $(SRCDIR_SRCS)
836836
$(SWIG) -mzscheme -c++ $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
837837
env CFLAGS= $(COMPILETOOL) $(MZC) `echo " $(CPPFLAGS) $(INCLUDES) $(CXXFLAGS)" | sed 's/ -/ ++ccf -/g'` --cc $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS)
838-
$(CXXSHARED) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $(LIBPREFIX)$(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) $(MZDYNOBJ) $(CXX_DLLIBS)
838+
$(CXXSHARED) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $(LIBPREFIX)$(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) $(MZDYNOBJ) $(CPP_DLLIBS)
839839

840840
# -----------------------------------------------------------------
841841
# Run mzscheme example
@@ -933,7 +933,7 @@ ocaml_dynamic_cpp: $(SRCDIR_SRCS)
933933
$(SWIG) -ocaml -c++ $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
934934
cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
935935
$(OCC) -cc '$(CXX) $(CPPFLAGS)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" $(ICXXSRCS:%.cxx=%.c) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) -ccopt -fPIC
936-
$(CXXSHARED) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $(INTERFACE:%.i=%@SO@) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) $(CXX_DLLIBS) $(LIBS)
936+
$(CXXSHARED) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $(INTERFACE:%.i=%@SO@) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) $(CPP_DLLIBS) $(LIBS)
937937
$(OCAMLDLGEN) $(INTERFACE:%.i=%.ml) $(INTERFACE:%.i=%@SO@) > $(INTERFACE:%.i=%_dynamic.ml)
938938
mv $(INTERFACE:%.i=%_dynamic.ml) $(INTERFACE:%.i=%.ml)
939939
rm $(INTERFACE:%.i=%.mli)
@@ -996,7 +996,7 @@ ruby: $(SRCDIR_SRCS)
996996
ruby_cpp: $(SRCDIR_SRCS)
997997
$(SWIG) -c++ -ruby $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
998998
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(RUBY_CFLAGS) $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(INCLUDES) $(RUBY_INCLUDE)
999-
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) $(CXX_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(RUBY_SO)
999+
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(RUBY_SO)
10001000

10011001
# -----------------------------------------------------------------
10021002
# Build statically linked Ruby interpreter
@@ -1064,7 +1064,7 @@ php: $(SRCDIR_SRCS)
10641064
php_cpp: $(SRCDIR_SRCS)
10651065
$(SWIG) -php -c++ $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
10661066
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PHP_INCLUDE)
1067-
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CXX_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP_SO)
1067+
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP_SO)
10681068

10691069
# -----------------------------------------------------------------
10701070
# Running a PHP example
@@ -1121,7 +1121,7 @@ csharp: $(SRCDIR_SRCS)
11211121
csharp_cpp: $(SRCDIR_SRCS)
11221122
$(SWIG) -csharp -c++ $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
11231123
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(CSHARPCFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES)
1124-
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) $(CXX_DLLIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(CSHARPSO)
1124+
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(CSHARPSO)
11251125

11261126
# ----------------------------------------------------------------
11271127
# Compile CSharp files
@@ -1195,7 +1195,7 @@ lua: $(SRCDIR_SRCS)
11951195
lua_cpp: $(SRCDIR_SRCS) $(GENCXXSRCS)
11961196
$(SWIG) -c++ -lua $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
11971197
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(GENCXXSRCS) $(INCLUDES) $(LUA_INCLUDE)
1198-
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(LUA_LIB) $(CXX_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(LUA_SO)
1198+
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(LUA_LIB) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(LUA_SO)
11991199

12001200
lua_externalhdr:
12011201
$(SWIG) -lua -external-runtime $(TARGET)
@@ -1258,7 +1258,7 @@ cffi: $(SRCDIR_SRCS)
12581258
cffi_cpp: $(SRCDIR_SRCS)
12591259
$(SWIG) -c++ -cffi $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
12601260
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(INCLUDES)
1261-
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CXX_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
1261+
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
12621262

12631263
# -----------------------------------------------------------------
12641264
# Run CFFI example
@@ -1369,7 +1369,7 @@ scilab:
13691369
scilab_cpp:
13701370
$(SWIG) -c++ -scilab $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
13711371
$(CXX) -g -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SCILAB_INC) $(INCLUDES) $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS)
1372-
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(IOBJS) $(OBJS) $(LIBS) $(CXX_DLLIBS) -o $(SCILAB_LIBPREFIX)$(TARGET)$(SO)
1372+
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(IOBJS) $(OBJS) $(LIBS) $(CPP_DLLIBS) -o $(SCILAB_LIBPREFIX)$(TARGET)$(SO)
13731373

13741374
# -----------------------------------------------------------------
13751375
# Running a Scilab example
@@ -1603,7 +1603,7 @@ d: $(SRCDIR_SRCS)
16031603
d_cpp: $(SRCDIR_SRCS)
16041604
$(SWIGD) -c++ $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
16051605
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(DCFLAGS) $(EXTRA_CFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES)
1606-
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(DCFLAGS) $(EXTRA_LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CXX_DLLIBS) -o $(DLIBPREFIX)$(TARGET)$(SO)
1606+
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(DCFLAGS) $(EXTRA_LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(DLIBPREFIX)$(TARGET)$(SO)
16071607

16081608
# ----------------------------------------------------------------
16091609
# Compile D files
@@ -1647,6 +1647,7 @@ FORTRANCXXFLAGS =
16471647
FORTRAN_RUNME = $(RUNME)
16481648
FMOD = $(INTERFACE:.i=.f90)
16491649
FOBJ = $(INTERFACE:.i=_fort.@OBJEXT@)
1650+
FORTRANLIBPREFIX = @FORTRANLIBPREFIX@
16501651
FORTRAN_SO = @FORTRAN_SO@
16511652
FCLIBS = @FCLIBS@
16521653
FORTRANLDSHARED = @FORTRANLDSHARED@
@@ -1658,22 +1659,22 @@ fortran: $(SRCDIR_SRCS)
16581659
$(ISRCS) $(SRCDIR_SRCS) $(SRCDIR_CSRCS) $(INCLUDES)
16591660
$(FC) -c $(CCSHARED) $(FCFLAGS) $(FMOD) -o $(FOBJ)
16601661
$(NOLINK) || $(FORTRANLDSHARED) $(CFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(FOBJ) \
1661-
$(FCLIBS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(FORTRAN_SO)
1662+
$(FCLIBS) $(LIBS) -o $(FORTRANLIBPREFIX)$(TARGET)$(FORTRAN_SO)
16621663

16631664
fortran_cpp: $(SRCDIR_SRCS)
16641665
$(SWIG) -fortran -c++ $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
16651666
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(FORTRANCXXFLAGS) \
16661667
$(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(INCLUDES)
16671668
$(FC) -c $(CCSHARED) $(FCFLAGS) $(FMOD) -o $(FOBJ)
16681669
$(NOLINK) || $(FORTRANCXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(FOBJ) \
1669-
$(FCLIBS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(FORTRAN_SO)
1670+
$(FCLIBS) $(LIBS) -o $(FORTRANLIBPREFIX)$(TARGET)$(FORTRAN_SO)
16701671

16711672
fortran_run: $(SRCDIR_SRCS)
16721673
env LD_LIBRARY_PATH=$$PWD $(RUNTOOL) ./$(RUNME).exe $(RUNPIPE)
16731674

16741675
# FORTRANSRCS is the 'runme.f90' in the 'Examples' dir
16751676
fortran_compile: $(SRCDIR_SRCS)
1676-
$(COMPILETOOL) $(FC) $(CCSHARED) $(FCFLAGS) $(addprefix $(SRCDIR),$(FORTRANSRCS)) $(patsubst %,$(LIBPREFIX)%$(FORTRAN_SO),$(TARGET)) \
1677+
$(COMPILETOOL) $(FC) $(CCSHARED) $(FCFLAGS) $(addprefix $(SRCDIR),$(FORTRANSRCS)) $(patsubst %,$(FORTRANLIBPREFIX)%$(FORTRAN_SO),$(TARGET)) \
16771678
-o $(RUNME).exe
16781679

16791680
fortran_clean:

‎Examples/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ the rules of thumb for making C++ work:
2727

2828
ld -G $(OBJS) -L/opt/SUNWspro/lib -lCrun -o module.so
2929

30-
This can be set by modifying the setting of CXX_DLLIBS in the
30+
This can be set by modifying the setting of CPP_DLLIBS in the
3131
Makefile.
3232

3333

‎Examples/fortran/except/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ build:
1919
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
2020
SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
2121
SWIGOPT='$(SWIGOPT)' TARGET='$(DOWNSTREAM2)' INTERFACE='$(INTERFACE2)' \
22-
LIBS='$$(LIBPREFIX)$(TARGET)$$(FORTRAN_SO)' \
22+
LIBS='$$(FORTRANLIBPREFIX)$(TARGET)$$(FORTRAN_SO)' \
2323
fortran_cpp
2424
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET) $(DOWNSTREAM2)' SRCDIR='$(SRCDIR)' \
2525
FORTRANSRCS='$(FORTRANSRCS)' fortran_compile

‎Examples/test-suite/fortran/Makefile.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
LANGUAGE = fortran
66
SCRIPTSUFFIX = _runme.F90
77
FORTRAN_SO = @FORTRAN_SO@
8+
FORTRANLIBPREFIX = @FORTRANLIBPREFIX@
89

910
CC = @CC@
1011
CXX = @CXX@
@@ -145,13 +146,13 @@ link_multi_cpp = \
145146
ALL_OBJS="$${ALL_OBJS} $${f}_wrap.o $${f}_fort.o" ; \
146147
done ; \
147148
@FORTRANCXXSHARED@ $(CXXFLAGS) $(LDFLAGS) $$ALL_OBJS \
148-
$(FCLIBS) -o $(LIBPREFIX)$*$(FORTRAN_SO)
149+
$(FCLIBS) -o $(FORTRANLIBPREFIX)$*$(FORTRAN_SO)
149150

150151
# Runs the testcase.
151152
run_testcase = \
152153
if [ -f $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
153154
$(COMPILETOOL) $(FC) $(FCFLAGS) $(CCSHARED) $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) -c; \
154-
$(COMPILETOOL) $(FC) $(FCFLAGS) $(CCSHARED) -o $*_runme.exe $(SCRIPTPREFIX)$*_runme.@OBJEXT@ $(LIBPREFIX)$*$(FORTRAN_SO); \
155+
$(COMPILETOOL) $(FC) $(FCFLAGS) $(CCSHARED) -o $*_runme.exe $(SCRIPTPREFIX)$*_runme.@OBJEXT@ $(FORTRANLIBPREFIX)$*$(FORTRAN_SO); \
155156
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./$*_runme.exe; \
156157
fi
157158

‎configure.ac

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ if test x"$enable_cpp11_testing" = xyes; then
325325
AC_MSG_RESULT([yes])
326326
PLATCXXFLAGS="$CXXCPP $PLATCXXFLAGS"
327327
HAVE_CXX11="1"
328-
else
328+
else
329329
AC_MSG_RESULT([no])
330330

331331
# Test for c++11
@@ -2660,11 +2660,18 @@ else
26602660
esac
26612661
fi
26622662

2663+
# Do not prefix library file names with "lib" on Windows.
2664+
case $host in
2665+
*-*-cygwin* | *-*-mingw*) FORTRANLIBPREFIX="";;
2666+
*)FORTRANLIBPREFIX="lib";;
2667+
esac
2668+
26632669
AC_SUBST(FC)
26642670
AC_SUBST(FCFLAGS)
26652671
AC_SUBST(FCLIBS)
26662672
AC_SUBST(FORTRANLDSHARED)
26672673
AC_SUBST(FORTRANCXXSHARED)
2674+
AC_SUBST(FORTRANLIBPREFIX)
26682675

26692676

26702677
#----------------------------------------------------------------

0 commit comments

Comments
 (0)