# HG changeset patch
# User John Donoghue
# Date 1425043146 18000
# Node ID 82bd7cd7d06d1366207403fe8c37df48d679f0d9
# Parent  01182b377bb1444734057f92f4da37ea4ee2a8a9
plotutils: create dlls, use with pstoedit

* src/plotutils.mk: build dlls from static libs

* src/pstoedit.mk: add plotutils as a dependancy of pstoedit

diff -r 01182b377bb1 -r 82bd7cd7d06d src/plotutils.mk
--- 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
diff -r 01182b377bb1 -r 82bd7cd7d06d src/pstoedit.mk
--- 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;