Merge branch 'dsilvers/tolibdom'

[libsvgtiny.git] / Makefile

diff --git a/Makefile b/Makefile
index 4556eec939920be7c2e3ec898cee6421eb97ffdd..ff41860122cf2f432d709c64012eca379157a4d4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,13 @@
 # Component settings
 COMPONENT := svgtiny
-COMPONENT_VERSION := 0.0.1
+COMPONENT_VERSION := 0.0.2
 # Default to a static library
 COMPONENT_TYPE ?= lib-static
 
 # Setup the tooling
-include build/makefiles/Makefile.tools
+PREFIX ?= /opt/netsurf
+NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+include $(NSSHARED)/makefiles/Makefile.tools
 
 TESTRUNNER := $(ECHO)
 
@@ -29,21 +31,18 @@ else
   CFLAGS := $(CFLAGS) -Dinline="__inline__"
 endif
 
-# LibXML2
+# libdom
 ifneq ($(PKGCONFIG),)
   CFLAGS := $(CFLAGS) \
-               $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags libxml-2.0)
-  LDFLAGS := $(LDFLAGS) \
-               $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs libxml-2.0)
+               $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags libdom libwapcaplet)
+  LDFLAGS := $(LDFLAGS) -lm \
+               $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs libdom libwapcaplet)
 else
-  ifeq ($(TARGET),beos)
-    CFLAGS := $(CFLAGS) -I/boot/home/config/include/libxml2
-  endif
-  CFLAGS := $(CFLAGS) -I$(PREFIX)/include/libxml2
-  LDFLAGS := $(CFLAGS) -lxml2
+  CFLAGS := $(CFLAGS) -I$(PREFIX)/include
+  LDFLAGS := $(CFLAGS) -ldom -lwapcaplet -lexpat -lm
 endif
 
-include build/makefiles/Makefile.top
+include $(NSBUILD)/Makefile.top
 
 # Extra installation rules
 I := /include