X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=Makefile;h=9466bcd1313a237b8d6421f1dc2d2f1b3af6e9d1;hb=4e4c0d2c2abb1e576aa91791ae660bc8f2b9c77a;hp=fe4cfe7b71f31aa46f934d6cc9fa6dda38e6a384;hpb=b9b4c3c90eea9b00da17d0cbdce195d715fdb01a;p=libsvgtiny.git

diff --git a/Makefile b/Makefile
index fe4cfe7..9466bcd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Component settings
 COMPONENT := svgtiny
-COMPONENT_VERSION := 0.0.2
+COMPONENT_VERSION := 0.1.2
 # Default to a static library
 COMPONENT_TYPE ?= lib-static
 
@@ -17,7 +17,7 @@ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
 	-Wmissing-declarations -Wnested-externs -pedantic
 # BeOS/Haiku/AmigaOS standard library headers create warnings
 ifneq ($(TARGET),beos)
-  ifneq ($(TARGET),AmigaOS)
+  ifneq ($(TARGET),amiga)
     WARNFLAGS := $(WARNFLAGS) -Werror
   endif
 endif
@@ -31,18 +31,15 @@ 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 $(NSBUILD)/Makefile.top
@@ -50,5 +47,5 @@ include $(NSBUILD)/Makefile.top
 # Extra installation rules
 I := /include
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/svgtiny.h
-INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in
-INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT)
+INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
+INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)