48 lines
1.8 KiB
Text
48 lines
1.8 KiB
Text
$NetBSD: patch-al,v 1.2 2012/04/08 02:37:36 dholland Exp $
|
|
|
|
The automake manual clearly specifies that if we mix fortran sources
|
|
in with c or c++ sources then we need to use the AC_F77_LIBRARY_LDFLAGS
|
|
autoconf macro and then add $(FLIBS) to either LDADD for a program or
|
|
LIBADD for a library.
|
|
|
|
Automake prohibits scripts in the "pkglib" dir for some reason, so
|
|
work around it by calling the dir "blahlib".
|
|
|
|
--- bem/Makefile.am.orig 2012-04-08 02:41:28.000000000 +0000
|
|
+++ bem/Makefile.am
|
|
@@ -26,12 +26,12 @@
|
|
# autoconf, and automake for the first time, you'll need to
|
|
# supply command line switches --add-missing --copy.
|
|
#----------------------------------------------------------------
|
|
-AUTOMAKE_OPTIONS = foreign subdir-objects
|
|
+AUTOMAKE_OPTIONS = foreign
|
|
|
|
#---------------------------------------------------------------
|
|
# tcl/tk scripts that may need to be installed.
|
|
#---------------------------------------------------------------
|
|
-pkglib_SCRIPTS = \
|
|
+blahlib_SCRIPTS = \
|
|
lib/bem.tcl \
|
|
lib/bem_gpge.itcl \
|
|
lib/bem_graphs.itcl \
|
|
@@ -46,7 +46,7 @@ pkglib_SCRIPTS = \
|
|
# Define an installation directory that includes
|
|
# the version number (from AC_INIT) like "bltmath1.0"
|
|
#---------------------------------------------------------------
|
|
-pkglibdir = $(libdir)/$(PACKAGE)$(PACKAGE_VERSION)
|
|
+blahlibdir = $(libdir)/$(PACKAGE)$(PACKAGE_VERSION)
|
|
|
|
#----------------------------------------------------------------
|
|
# nmmtl is our main target
|
|
@@ -71,9 +71,11 @@ bem_TESTS = tests/test_bem.tcl
|
|
#----------------------------------------------------------------
|
|
bem_SOURCES = $(cpp_SOURCES) $(fortran_SOURCES) \
|
|
src/nmmtl_parse_xsctn.cpp
|
|
+bem_LDADD = $(FLIBS)
|
|
|
|
nmmtl_SOURCES = $(cpp_SOURCES) $(fortran_SOURCES) \
|
|
src/nmmtl_parse_graphic.cpp
|
|
+nmmtl_LDADD = $(FLIBS)
|
|
|
|
|
|
#----------------------------------------------------------------
|