Mercurial > mxe-octave

changeset 1394:e060d91fe3b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplified build file of package tinyxml
author Volker Grabsch <vog@notjusthosting.com>
date Wed, 17 Nov 2010 15:21:47 +0100
parents 1d73365278e8
children 6e4fd771390f
files src/tinyxml.mk
diffstat 1 files changed, 13 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/tinyxml.mk	Wed Nov 17 14:40:21 2010 +0100
+++ b/src/tinyxml.mk	Wed Nov 17 15:21:47 2010 +0100
@@ -4,36 +4,32 @@
 # tinyxml
 PKG             := tinyxml
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2_6_1
+$(PKG)_VERSION  := 2.6.1
 $(PKG)_CHECKSUM := 2ff9c177a6c0bef10cbd27700b71826801c12987
-$(PKG)_SUBDIR   := tinyxml
-$(PKG)_FILE     := tinyxml_$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE  := http://sourceforge.net/projects/tinyxml/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tinyxml/tinyxml/$(subst _,.,$($(PKG)_VERSION))/$($(PKG)_FILE)
+$(PKG)_SUBDIR   := $(PKG)
+$(PKG)_FILE     := $(PKG)_$(subst .,_,$($(PKG)_VERSION)).tar.gz
+$(PKG)_WEBSITE  := http://sourceforge.net/projects/$(PKG)/
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
     $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/tinyxml/files/tinyxml/) | \
     $(SED) -n 's,.*tinyxml_\([0-9][^>]*\)\.tar.*,\1,p' | \
+    $(SED) 's,_,.,g' | \
     tail -1
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && \
-    $(TARGET)-g++ -c -O3 -Wall -Wno-unknown-pragmas -Wno-format -D TIXML_USE_STL -o tinyxml.o tinyxml.cpp && \
-    $(TARGET)-g++ -c -O3 -Wall -Wno-unknown-pragmas -Wno-format -D TIXML_USE_STL -o tinyxmlparser.o tinyxmlparser.cpp && \
-    $(TARGET)-g++ -c -O3 -Wall -Wno-unknown-pragmas -Wno-format -D TIXML_USE_STL -o tinyxmlerror.o tinyxmlerror.cpp && \
-    $(TARGET)-g++ -c -O3 -Wall -Wno-unknown-pragmas -Wno-format -D TIXML_USE_STL -o tinystr.o tinystr.cpp && \
-    $(TARGET)-g++ -c -O3 -Wall -Wno-unknown-pragmas -Wno-format -D TIXML_USE_STL -o tinyxmlerror.o tinyxmlerror.cpp && \
-    $(TARGET)-ar cr libtinyxml.a tinystr.o tinyxmlerror.o tinyxml.o tinyxmlparser.o
+    cd '$(1)' && $(TARGET)-g++ -c -O3 -Wall -Wno-unknown-pragmas -Wno-format -D TIXML_USE_STL '$(1)'/*.cpp
+    cd '$(1)' && $(TARGET)-ar cr libtinyxml.a *.o
     $(TARGET)-ranlib '$(1)/libtinyxml.a'
-    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
-    $(INSTALL) -m644 '$(1)/libtinyxml.a' '$(PREFIX)/$(TARGET)/lib/libtinyxml.a'
-    $(INSTALL) -d '$(PREFIX)/$(TARGET)/include'
-    $(INSTALL) -m644 '$(1)/tinyxml.h' '$(1)/tinystr.h' '$(PREFIX)/$(TARGET)/include/'
+    $(INSTALL) -d               '$(PREFIX)/$(TARGET)/lib'
+    $(INSTALL) -m644 '$(1)'/*.a '$(PREFIX)/$(TARGET)/lib/'
+    $(INSTALL) -d               '$(PREFIX)/$(TARGET)/include'
+    $(INSTALL) -m644 '$(1)'/*.h '$(PREFIX)/$(TARGET)/include/'
 
     '$(TARGET)-g++' \
         -W -Wall -D TIXML_USE_STL -Werror -ansi -pedantic \
         '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-tinyxml.exe' \
-        -I'$(PREFIX)/$(TARGET)/include/' -ltinyxml
+        -ltinyxml
 endef