1
0

patch-Makefile_in 3.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103
  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:06:25.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,21 +133,21 @@ 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. $(INSTALL_DATA) mxml.pc $(BUILDROOT)$(libdir)/pkgconfig
  30. - $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1
  31. - $(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.1
  32. - $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
  33. - $(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3
  34. + #$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1
  35. + #$(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.1
  36. + #$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
  37. + #$(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3
  38. install-libmxml.a:
  39. $(INSTALL_DIR) $(BUILDROOT)$(libdir)
  40. @@ -294,7 +294,7 @@ mxmldoc: $(LIBMXML) mxmldoc.o
  41. $(CC) -L. $(LDFLAGS) -o $@ mxmldoc.o -lmxml $(LIBS)
  42. mxmldoc-static: libmxml.a mxmldoc.o
  43. - $(CC) $(LDFLAGS) -o $@ mxmldoc.o libmxml.a $(LIBS)
  44. + $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ mxmldoc.o libmxml.a $(LIBS)
  45. mxmldoc.o: mxml.h
  46. @@ -304,28 +304,7 @@ mxmldoc.o: mxml.h
  47. #
  48. testmxml: libmxml.a testmxml.o
  49. - $(CC) $(LDFLAGS) -o $@ testmxml.o libmxml.a $(LIBS)
  50. - @echo Testing library...
  51. - ./testmxml test.xml >temp1.xml 2>temp1s.xml
  52. - ./testmxml temp1.xml >temp2.xml 2>temp2s.xml
  53. - @if cmp temp1.xml temp2.xml; then \
  54. - echo Stdio file test passed!; \
  55. - $(RM) temp2.xml temp2s.xml; \
  56. - else \
  57. - echo Stdio file test failed!; \
  58. - fi
  59. - @if cmp temp1.xml temp1s.xml; then \
  60. - echo String test passed!; \
  61. - $(RM) temp1.xml temp1s.xml; \
  62. - else \
  63. - echo String test failed!; \
  64. - fi
  65. - @if cmp test.xml test.xmlfd; then \
  66. - echo File descriptor test passed!; \
  67. - $(RM) test.xmlfd; \
  68. - else \
  69. - echo File descriptor test failed!; \
  70. - fi
  71. + $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ testmxml.o libmxml.a $(LIBS)
  72. testmxml.o: mxml.h
  73. @@ -336,19 +315,7 @@ testmxml.o: mxml.h
  74. mxml.xml: mxmldoc-static mxml.h $(PUBLIBOBJS:.o=.c)
  75. $(RM) mxml.xml
  76. - ./mxmldoc-static --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
  77. - if test "x`uname`" = xDarwin; then \
  78. - ./mxmldoc-static --docset org.minixml.docset \
  79. - --docversion @VERSION@ --feedname minixml.org \
  80. - --feedurl http://www.minixml.org/org.minixml.atom \
  81. - --header doc/docset.header --intro doc/docset.intro \
  82. - --css doc/docset.css --title "Mini-XML API Reference" \
  83. - mxml.xml || exit 1; \
  84. - /Developer/usr/bin/docsetutil package --output org.minixml.xar \
  85. - --atom org.minixml.atom \
  86. - --download-url http://www.minixml.org/org.minixml.xar \
  87. - org.minixml.docset || exit 1; \
  88. - fi
  89. + #./mxmldoc-static --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
  90. valgrind: mxmldoc-static
  91. $(RM) valgrind.xml