Updated UCW::Configure to the version from current LibUCW

[leo.git] / Makefile

diff --git a/Makefile b/Makefile
index 22214549483ecdccfd6fe42307691bf60325df97..036bcda70d56be1850bac53145d49937501b5ad5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,11 +16,11 @@ include $(BUILDSYS)/Maketop
 PROGS+=$(o)/leo
 CFLAGS+=$(LIBUCW_CFLAGS)
 
-LEO_MODULES=leo xml osm svg svg-icon css-parse css-lex style css dict sym sym-point sym-line sym-text map shp
+LEO_MODULES=leo xml osm svg svg-icon css-parse css-lex style css dict sym sym-point sym-line sym-text map shp fixed
 LEO_OBJECTS=$(addprefix $(o)/, $(addsuffix .o, $(LEO_MODULES)))
 $(o)/leo: $(LEO_OBJECTS)
 
-$(o)/leo: LIBS+=$(LIBUCW_LIBS) $(LIBUCW_CHARSET_LIBS) $(LIBUCW_XML_LIBS) $(PANGOFT2_LIBS) $(FREETYPE_LIBS) -lproj
+$(o)/leo: LIBS+=$(LIBUCW_LIBS) $(LIBUCW_CHARSET_LIBS) $(LIBUCW_XML_LIBS) $(PANGOFT2_LIBS) $(FREETYPE_LIBS) -lproj -lm
 
 $(o)/sym-text.o: CFLAGS+=$(FREETYPE_CFLAGS) $(PANGOFT2_CFLAGS)
 $(o)/svg-icon.o: CFLAGS+=$(LIBUCW_XML_CFLAGS)
@@ -42,10 +42,10 @@ install:
 endif
 .PHONY: install
 
-#output.svg: leo dump.osm poskole.css
-#      ./leo
-#
-#output.pdf: output.svg
-#      inkscape --export-pdf=output.pdf output.svg
+output.svg: $(o)/leo dump.osm poskole.css
+       $(o)/leo
+
+output.pdf: output.svg
+       inkscape --export-pdf=output.pdf output.svg
 
 include $(BUILDSYS)/Makebottom