Changeset 3b7b36 in git for resources

Timestamp:

Nov 30, 2016, 4:31:11 PM (7 years ago)

Author:

Erik M. Bray <erik.bray@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

f6e134d4455dbb70a1514f4e5f64dac2e165f062

Parents:

92a783db4ae2d2bda1979855012b407ac340e9a4

Message:

Updated configure.ac and Makefile.am files to work on Windows, taking
advantage of the new SING_WIN_FLAGS macro.

* In configure.ac use SING_WIN_FLAGS, and also use LT_INIT([win32-dll])
  to tell libtool to build DLLs.
* In Makefile.am add $(SINGULAR_LDFLAGS) to _la_LDFLAGS variables--on
  most platforms $(SINGULAR_LDFLAGS) will be empty, currently, but this
  is used on Windows to pass the required -no-undefined flag to
  libtool.
* In some Makefile.am files add/update _la_LIBADD variables to ensure
  that libSingular.la is found by modules that need symbols from
  libSingular.

Location:

resources

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)

resources/Makefile.am

@@ -12 +12 @@
 libsingular_resources_la_SOURCES   = $(SOURCES)
 
-libsingular_resources_la_LDFLAGS   = -release ${PACKAGE_VERSION}
+libsingular_resources_la_LDFLAGS   = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
 
 libsingular_resources_includedir  =$(includedir)/resources

resources/configure.ac

@@ -39 +39 @@
 # Turn off shared libraries during beta-testing, since they
 # make the build process take too long.
-LT_INIT
+LT_INIT([win32-dll])
 # ([shared])
-# LT_INIT(dlopen disable-static) # doesn't work on PowerPC!
+# LT_INIT([win32-dll])(dlopen disable-static) # doesn't work on PowerPC!
 
 # SING_CHECK_PIPE
+
+SING_WIN_FLAGS
 
 ##### SEE http://www.gnu.org/prep/standards/html_node/Directory-Variables.html