X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=Makefile;h=fe6f657c9830ac5f3119c829c4f9bc5980004ff3;hb=e368730948266bb88347ace7a1da642a4f8781a2;hp=cb393a7b7a8f6eb39c751e69bd204e1f17230a39;hpb=d03a7471001c4701e1fea976aee162b0de375f52;p=libsvgtiny.git diff --git a/Makefile b/Makefile index cb393a7..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 @@ -34,12 +34,12 @@ endif # libdom ifneq ($(PKGCONFIG),) CFLAGS := $(CFLAGS) \ - $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags libdom) - LDFLAGS := $(LDFLAGS) \ - $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs libdom) + $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags libdom libwapcaplet) + LDFLAGS := $(LDFLAGS) -lm \ + $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs libdom libwapcaplet) else CFLAGS := $(CFLAGS) -I$(PREFIX)/include - LDFLAGS := $(CFLAGS) -ldom + LDFLAGS := $(CFLAGS) -ldom -lwapcaplet -lexpat -lm endif include $(NSBUILD)/Makefile.top