Mercurial > mxe-octave
changeset 3812:82bd7cd7d06d
plotutils: create dlls, use with pstoedit
* src/plotutils.mk: build dlls from static libs
* src/pstoedit.mk: add plotutils as a dependancy of pstoedit
| author | John Donoghue |
|---|---|
| date | Fri, 27 Feb 2015 08:19:06 -0500 |
| parents | 01182b377bb1 |
| children | ea3cab4018c5 |
| files | src/plotutils.mk src/pstoedit.mk |
| diffstat | 2 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/plotutils.mk Thu Feb 26 09:17:38 2015 -0800 +++ b/src/plotutils.mk Fri Feb 27 08:19:06 2015 -0500 @@ -22,11 +22,22 @@ cd '$(1)' && ./configure \ --prefix='$(HOST_PREFIX)' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(ENABLE_SHARED_OR_STATIC) \ + $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + --disable-shared --enable-static \ --enable-libplotter \ --enable-libxmi \ --with-png \ --without-x \ - CFLAGS='-DNO_SYSTEM_GAMMA' - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= INFO_DEPS= + CFLAGS='-DNO_SYSTEM_GAMMA' LIBS='-lpng -lz' + + $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= INFO_DEPS= + + if [ "$(BUILD_SHARED)" = yes ]; then \ + $(MAKE) -C '$(1)' -j 1 bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= INFO_DEPS= lib_LTLIBRARIES= install; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CXX)' $(1)/libplot/.libs/libplot.a --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)' -lpng -lz; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CXX)' $(1)/libplotter/.libs/libplotter.a --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)' -lpng -lz; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CXX)' $(1)/libxmi/.libs/libxmi.a --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ + else \ + $(MAKE) -C '$(1)' -j 1 bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= INFO_DEPS= install; \ + fi endef
--- a/src/pstoedit.mk Thu Feb 26 09:17:38 2015 -0800 +++ b/src/pstoedit.mk Fri Feb 27 08:19:06 2015 -0500 @@ -8,7 +8,7 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://sourceforge.net/projects/pstoedit/files/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)/download -$(PKG)_DEPS := +$(PKG)_DEPS := plotutils define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package pstoedit.' >&2;