patch-Makefile_in.orig 3.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091
  1. --- mxml-2.6.orig/Makefile.in 2008-12-06 05:20:38.000000000 +0100
  2. +++ mxml-2.6/Makefile.in 2011-05-10 13:05:50.000000000 +0200
  3. @@ -88,7 +88,7 @@ PUBLIBOBJS = mxml-attr.o mxml-entity.o m
  4. mxml-node.o mxml-search.o mxml-set.o
  5. LIBOBJS = $(PUBLIBOBJS) mxml-private.o mxml-string.o
  6. OBJS = mxmldoc.o testmxml.o $(LIBOBJS)
  7. -TARGETS = $(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man
  8. +TARGETS = $(LIBMXML)
  9. #
  10. @@ -133,13 +133,13 @@ clang:
  11. # Install everything...
  12. #
  13. -install: $(TARGETS) install-$(LIBMXML) install-libmxml.a
  14. +install: $(TARGETS) install-$(LIBMXML)
  15. $(INSTALL_DIR) $(BUILDROOT)$(bindir)
  16. - $(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir)
  17. - $(INSTALL_DIR) $(BUILDROOT)$(docdir)
  18. - for file in $(DOCFILES); do \
  19. - $(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \
  20. - done
  21. + #$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir)
  22. + #$(INSTALL_DIR) $(BUILDROOT)$(docdir)
  23. + #for file in $(DOCFILES); do \
  24. + # $(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \
  25. + #done
  26. $(INSTALL_DIR) $(BUILDROOT)$(includedir)
  27. $(INSTALL_DATA) mxml.h $(BUILDROOT)$(includedir)
  28. $(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig
  29. @@ -294,7 +294,7 @@ mxmldoc: $(LIBMXML) mxmldoc.o
  30. $(CC) -L. $(LDFLAGS) -o $@ mxmldoc.o -lmxml $(LIBS)
  31. mxmldoc-static: libmxml.a mxmldoc.o
  32. - $(CC) $(LDFLAGS) -o $@ mxmldoc.o libmxml.a $(LIBS)
  33. + $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ mxmldoc.o libmxml.a $(LIBS)
  34. mxmldoc.o: mxml.h
  35. @@ -304,28 +304,7 @@ mxmldoc.o: mxml.h
  36. #
  37. testmxml: libmxml.a testmxml.o
  38. - $(CC) $(LDFLAGS) -o $@ testmxml.o libmxml.a $(LIBS)
  39. - @echo Testing library...
  40. - ./testmxml test.xml >temp1.xml 2>temp1s.xml
  41. - ./testmxml temp1.xml >temp2.xml 2>temp2s.xml
  42. - @if cmp temp1.xml temp2.xml; then \
  43. - echo Stdio file test passed!; \
  44. - $(RM) temp2.xml temp2s.xml; \
  45. - else \
  46. - echo Stdio file test failed!; \
  47. - fi
  48. - @if cmp temp1.xml temp1s.xml; then \
  49. - echo String test passed!; \
  50. - $(RM) temp1.xml temp1s.xml; \
  51. - else \
  52. - echo String test failed!; \
  53. - fi
  54. - @if cmp test.xml test.xmlfd; then \
  55. - echo File descriptor test passed!; \
  56. - $(RM) test.xmlfd; \
  57. - else \
  58. - echo File descriptor test failed!; \
  59. - fi
  60. + $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ testmxml.o libmxml.a $(LIBS)
  61. testmxml.o: mxml.h
  62. @@ -336,19 +315,7 @@ testmxml.o: mxml.h
  63. mxml.xml: mxmldoc-static mxml.h $(PUBLIBOBJS:.o=.c)
  64. $(RM) mxml.xml
  65. - ./mxmldoc-static --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
  66. - if test "x`uname`" = xDarwin; then \
  67. - ./mxmldoc-static --docset org.minixml.docset \
  68. - --docversion @VERSION@ --feedname minixml.org \
  69. - --feedurl http://www.minixml.org/org.minixml.atom \
  70. - --header doc/docset.header --intro doc/docset.intro \
  71. - --css doc/docset.css --title "Mini-XML API Reference" \
  72. - mxml.xml || exit 1; \
  73. - /Developer/usr/bin/docsetutil package --output org.minixml.xar \
  74. - --atom org.minixml.atom \
  75. - --download-url http://www.minixml.org/org.minixml.xar \
  76. - org.minixml.docset || exit 1; \
  77. - fi
  78. + #./mxmldoc-static --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
  79. valgrind: mxmldoc-static
  80. $(RM) valgrind.xml