X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=Makefile;h=fe6f657c9830ac5f3119c829c4f9bc5980004ff3;hb=e368730948266bb88347ace7a1da642a4f8781a2;hp=fe4cfe7b71f31aa46f934d6cc9fa6dda38e6a384;hpb=b9b4c3c90eea9b00da17d0cbdce195d715fdb01a;p=libsvgtiny.git diff --git a/Makefile b/Makefile index fe4cfe7..fe6f657 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Component settings COMPONENT := svgtiny -COMPONENT_VERSION := 0.0.2 +COMPONENT_VERSION := 0.1.0 # 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