Mercurial > mxe-octave

diff src/gl2ps.mk @ 3834:291c610413cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use autotools for building gl2ps on Linux systems
author John W. Eaton <jwe@octave.org>
date Wed, 04 Mar 2015 17:25:01 -0500
parents c2abfa00fca5
children e2f0a87790ca
line wrap: on
line diff
--- a/src/gl2ps.mk	Thu Mar 05 10:15:53 2015 -0500
+++ b/src/gl2ps.mk	Wed Mar 04 17:25:01 2015 -0500
@@ -16,13 +16,7 @@
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
     ifeq ($(MXE_SYSTEM),msvc)
         $(PKG)_CMAKE_FLAGS := -G 'NMake Makefiles'
-    else
-        $(PKG)_CMAKE_FLAGS := -G 'MSYS Makefiles'
     endif
-else
-    $(PKG)_CMAKE_FLAGS := \
-        -DCMAKE_AR='$(MXE_AR)' \
-        -DCMAKE_RANLIB='$(MXE_RANLIB)' 
 endif
 
 define $(PKG)_UPDATE
@@ -31,7 +25,7 @@
 endef
 
 ifeq ($(MXE_SYSTEM),msvc)
-define $(PKG)_BUILD
+  define $(PKG)_BUILD
     cd '$(1)' && cmake \
         $($(PKG)_CMAKE_FLAGS) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
@@ -39,33 +33,50 @@
         .
     cd '$(1)' && env -u MAKE -u MAKEFLAGS nmake
     cd '$(1)' && env -u MAKE -u MAKEFLAGS nmake DESTDIR='$(3)' install
-endef
+  endef
 else
-define $(PKG)_BUILD
-    cd '$(1)' && cmake \
-        $($(PKG)_CMAKE_FLAGS) \
-        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-        .
-    $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 
+  ifeq ($(MXE_SYSTEM),mingw)
+    define $(PKG)_BUILD
+      cd '$(1)' && cmake \
+	  $($(PKG)_CMAKE_FLAGS) \
+	  -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
+	  .
+      $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 
 
-    # native mingw build doesnt want to install the files, even
-    # though it logs that it did
-    if [ x$(MXE_NATIVE_MINGW_BUILD) = xyes ]; then \
-      $(INSTALL) -d '$(3)$(HOST_LIBDIR)'; \
-      $(INSTALL) -m644 '$(1)/libgl2ps.a' '$(3)$(HOST_LIBDIR)'; \
-      $(INSTALL) -m644 '$(1)/libgl2ps.dll.a' '$(3)$(HOST_LIBDIR)'; \
-      $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \
-      $(INSTALL) -m644 '$(1)/libgl2ps.dll' '$(3)$(HOST_BINDIR)'; \
-      $(INSTALL) -d '$(3)$(HOST_INCDIR)'; \
-      $(INSTALL) -m644 '$(1)/gl2ps.h' '$(3)$(HOST_INCDIR)'; \
-    else \
-      $(MAKE) -C '$(1)' -j 1 VERBOSE=1 DESTDIR='$(3)' install; \
-      if [ $(MXE_SYSTEM) = mingw ]; then \
-        echo "Install dll"; \
-        $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \
-        $(INSTALL) '$(3)$(HOST_LIBDIR)/libgl2ps.dll' '$(3)$(HOST_BINDIR)/'; \
-        rm -f '$(3)$(HOST_LIBDIR)/libgl2ps.dll'; \
-      fi; \
-    fi
-endef
+      # native mingw build doesnt want to install the files, even
+      # though it logs that it did
+      if [ x$(MXE_NATIVE_MINGW_BUILD) = xyes ]; then \
+	$(INSTALL) -d '$(3)$(HOST_LIBDIR)'; \
+	$(INSTALL) -m644 '$(1)/libgl2ps.a' '$(3)$(HOST_LIBDIR)'; \
+	$(INSTALL) -m644 '$(1)/libgl2ps.dll.a' '$(3)$(HOST_LIBDIR)'; \
+	$(INSTALL) -d '$(3)$(HOST_BINDIR)'; \
+	$(INSTALL) -m644 '$(1)/libgl2ps.dll' '$(3)$(HOST_BINDIR)'; \
+	$(INSTALL) -d '$(3)$(HOST_INCDIR)'; \
+	$(INSTALL) -m644 '$(1)/gl2ps.h' '$(3)$(HOST_INCDIR)'; \
+      else \
+	$(MAKE) -C '$(1)' -j 1 VERBOSE=1 DESTDIR='$(3)' install; \
+	if [ $(MXE_SYSTEM) = mingw ]; then \
+	  echo "Install dll"; \
+	  $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \
+	  $(INSTALL) '$(3)$(HOST_LIBDIR)/libgl2ps.dll' '$(3)$(HOST_BINDIR)/'; \
+	  rm -f '$(3)$(HOST_LIBDIR)/libgl2ps.dll'; \
+	fi; \
+      fi
+    endef
+  else
+    define $(PKG)_BUILD
+      mkdir '$(1)/.build'
+      cd '$(1)' && autoreconf --force
+      cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+	  $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+	  $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+	  --prefix='$($(PKG)_PREFIX)' \
+	  && $(CONFIGURE_POST_HOOK)
+
+      $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
+      $(MAKE) -C '$(1)/.build' -j 1 install DESTDIR='$(3)'
+    endef
+  endif
 endif
+
+