$NetBSD: patch-ak,v 1.3 2011/07/02 22:19:30 dholland Exp $ - Fix linkage of internal static libs so they don't trip on the wrappers. --- Amaya/amaya/Makefile.in.orig 2009-11-09 11:45:10.000000000 +0000 +++ Amaya/amaya/Makefile.in @@ -16,7 +16,7 @@ include ../Options INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUDES) $(EXPAT_INCLUDES) $(GUI_INCLUDES) $(EXTRA_INCLUDES) $(GL_INCLUDES) $(GTK_GL_INCLUDES) $(FREETYPE_INCLUDES) $(XFT_INCLUDES) LIBS = $(AMAYA_ANNOT_LIBS) $(AMAYA_DAV_LIBS) \ $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) \ - -L../thotlib -L.. -lThotEditor \ + ../thotlib/libThotEditor.a \ $(AMAYA_OPTION_EXTRA_LIBS) $(EXPAT_LIBRARIES) \ $(GL_LIBRARIES) $(GTK_GL_LIBRARIES) $(FREETYPE_LIBRARIES) $(XFT_LIBRARIES) \ $(AMAYA_LIBWWW_LIBS) \ @@ -156,7 +156,7 @@ AMAYA_LIBS= ../thotlib/libThotEditor.a \ libCSS.a $(AMAYA_OPTION_LIBS) \ $(WX_LINKDEPS) -HTML2THOT_LIBS= -L../thotlib/ -lThotKernel -L.. -lz +HTML2THOT_LIBS= ../thotlib/libThotKernel.a -lz amaya_schemas : compHTML compHTMLP compHTMLT compTextFile compTextFileP compTextFileT compXLink compXLinkP compXLinkT compXML compXMLP compXMLT compHTMLA compTextFileA compXLinkA compXMLA $(svg_schema) $(math_schema) $(annot_schema) compEDITORA $(template_schema)