Permalink
Browse files

[NEW] Markdown 1.4.1: Upgraded to discount 1.3.0, which solves a bunc…

…h of crashers.

git-svn-id: http://rentzsch.com/svn/trunk/cocoa/MarkdownLive@350 34dae961-d50d-0410-846e-a203d89df655
  • Loading branch information...
1 parent af2d72a commit 3a391bcfe774f1fb23c80baaea27709b8ffbb532 wolf committed Nov 16, 2008
Showing with 856 additions and 200 deletions.
  1. +3 −3 Info.plist
  2. +16 −18 MarkdownLive.xcodeproj/project.pbxproj
  3. +1 −1 MyDocument.m
  4. +0 −1 discount-1.2.10/VERSION
  5. +0 −5 discount-1.2.10/config.md
  6. +0 −22 discount-1.2.10/tests/code.t
  7. 0 {discount-1.2.10 → discount-1.3.0}/COPYRIGHT
  8. 0 {discount-1.2.10 → discount-1.3.0}/INSTALL
  9. +17 −11 {discount-1.2.10 → discount-1.3.0}/Makefile
  10. +12 −6 {discount-1.2.10 → discount-1.3.0}/Makefile.in
  11. 0 {discount-1.2.10 → discount-1.3.0}/README
  12. +1 −0 discount-1.3.0/VERSION
  13. 0 {discount-1.2.10 → discount-1.3.0}/amalloc.c
  14. 0 {discount-1.2.10 → discount-1.3.0}/amalloc.h
  15. 0 {discount-1.2.10 → discount-1.3.0}/config.cmd
  16. +1 −1 {discount-1.2.10 → discount-1.3.0}/config.h
  17. +9 −8 {discount-1.2.10 → discount-1.3.0}/config.log
  18. 0 {discount-1.2.10 → discount-1.3.0}/config.mak
  19. +5 −0 discount-1.3.0/config.md
  20. +4 −3 {discount-1.2.10 → discount-1.3.0}/config.sub
  21. 0 {discount-1.2.10 → discount-1.3.0}/configure.inc
  22. +24 −8 {discount-1.2.10 → discount-1.3.0}/configure.sh
  23. 0 {discount-1.2.10 → discount-1.3.0}/cstring.h
  24. 0 {discount-1.2.10 → discount-1.3.0}/docheader.c
  25. 0 {discount-1.2.10 → discount-1.3.0}/dumptree.c
  26. 0 {discount-1.2.10 → discount-1.3.0}/echo.c
  27. +79 −35 {discount-1.2.10 → discount-1.3.0}/generate.c
  28. +39 −25 {discount-1.2.10 → discount-1.3.0}/main.c
  29. +27 −0 discount-1.3.0/makepage.c
  30. +10 −0 {discount-1.2.10 → discount-1.3.0}/markdown.1
  31. +117 −0 discount-1.3.0/markdown.1.in
  32. +7 −0 {discount-1.2.10 → discount-1.3.0}/markdown.3
  33. 0 {discount-1.2.10 → discount-1.3.0}/markdown.7
  34. +82 −23 {discount-1.2.10 → discount-1.3.0}/markdown.c
  35. +7 −2 {discount-1.2.10 → discount-1.3.0}/markdown.h
  36. +24 −3 {discount-1.2.10 → discount-1.3.0}/mkd-extensions.7
  37. +19 −3 {discount-1.2.10 → discount-1.3.0}/mkd-functions.3
  38. 0 {discount-1.2.10 → discount-1.3.0}/mkd2html.c
  39. +16 −0 {discount-1.2.10 → discount-1.3.0}/mkdio.c
  40. +6 −0 {discount-1.2.10 → discount-1.3.0}/mkdio.h
  41. +2 −0 {discount-1.2.10 → discount-1.3.0}/resource.c
  42. 0 {discount-1.2.10 → discount-1.3.0}/tests/chrome.text
  43. +49 −0 discount-1.3.0/tests/code.t
  44. 0 {discount-1.2.10 → discount-1.3.0}/tests/crash.t
  45. 0 {discount-1.2.10 → discount-1.3.0}/tests/dl.t
  46. 0 {discount-1.2.10 → discount-1.3.0}/tests/embedlinks.text
  47. +9 −8 {discount-1.2.10 → discount-1.3.0}/tests/emphasis.t
  48. 0 {discount-1.2.10 → discount-1.3.0}/tests/flow.t
  49. 0 {discount-1.2.10 → discount-1.3.0}/tests/footnotes.t
  50. +33 −0 discount-1.3.0/tests/header.t
  51. 0 {discount-1.2.10 → discount-1.3.0}/tests/html.t
  52. 0 {discount-1.2.10 → discount-1.3.0}/tests/links.text
  53. 0 {discount-1.2.10 → discount-1.3.0}/tests/linkylinky.t
  54. 0 {discount-1.2.10 → discount-1.3.0}/tests/linkypix.t
  55. +15 −0 {discount-1.2.10 → discount-1.3.0}/tests/list.t
  56. 0 {discount-1.2.10 → discount-1.3.0}/tests/list3deep.t
  57. 0 {discount-1.2.10 → discount-1.3.0}/tests/misc.t
  58. 0 {discount-1.2.10 → discount-1.3.0}/tests/pandoc.t
  59. 0 {discount-1.2.10 → discount-1.3.0}/tests/para.t
  60. +61 −0 discount-1.3.0/tests/peculiarities.t
  61. 0 {discount-1.2.10 → discount-1.3.0}/tests/pseudo.t
  62. 0 {discount-1.2.10 → discount-1.3.0}/tests/reparse.t
  63. +16 −2 {discount-1.2.10 → discount-1.3.0}/tests/smarty.t
  64. 0 {discount-1.2.10 → discount-1.3.0}/tests/style.t
  65. 0 {discount-1.2.10 → discount-1.3.0}/tests/syntax.text
  66. 0 {discount-1.2.10 → discount-1.3.0}/tests/tabstop.t
  67. 0 {discount-1.2.10 → discount-1.3.0}/tests/xml.t
  68. 0 {discount-1.2.10 → discount-1.3.0}/theme.1
  69. +13 −3 {discount-1.2.10 → discount-1.3.0}/theme.c
  70. +62 −0 discount-1.3.0/toc.c
  71. +9 −3 {discount-1.2.10 → discount-1.3.0}/version.c
  72. +9 −3 {discount-1.2.10 → discount-1.3.0}/version.c.in
  73. +49 −0 discount-1.3.0/xmlpage.c
  74. +1 −1 discountWrapper.m
  75. +1 −1 markdownWrapper.c
  76. +1 −1 mkdioWrapper.c
View
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
@@ -40,9 +40,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.4</string>
+ <string>1.4.1</string>
<key>CFBundleShortVersionString</key>
- <string>1.4</string>
+ <string>1.4.1</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
@@ -7,14 +7,14 @@
objects = {
/* Begin PBXBuildFile section */
- 79252FF20E8E080100DFAD98 /* generate.c in Sources */ = {isa = PBXBuildFile; fileRef = 79252FF10E8E080100DFAD98 /* generate.c */; };
792530F00E8F40F200DFAD98 /* discountWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 792530EF0E8F40F200DFAD98 /* discountWrapper.m */; };
- 792530FB0E8F49CE00DFAD98 /* mkdio.c in Sources */ = {isa = PBXBuildFile; fileRef = 792530FA0E8F49CE00DFAD98 /* mkdio.c */; };
- 792530FF0E8F49E800DFAD98 /* markdown.c in Sources */ = {isa = PBXBuildFile; fileRef = 792530FE0E8F49E800DFAD98 /* markdown.c */; };
- 792531010E8F4A0900DFAD98 /* resource.c in Sources */ = {isa = PBXBuildFile; fileRef = 792531000E8F4A0900DFAD98 /* resource.c */; };
792531470E8F4CD800DFAD98 /* mkdioWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 792531460E8F4CD800DFAD98 /* mkdioWrapper.c */; };
7925314B0E8F4E4D00DFAD98 /* markdownWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 7925314A0E8F4E4D00DFAD98 /* markdownWrapper.c */; };
796A2AD80A20DCEE00440275 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 796A2AD70A20DCEE00440275 /* WebKit.framework */; };
+ 797EF6930ED0EB5400B28F7A /* resource.c in Sources */ = {isa = PBXBuildFile; fileRef = 797EF68F0ED0EB5400B28F7A /* resource.c */; };
+ 797EF6940ED0EB5400B28F7A /* generate.c in Sources */ = {isa = PBXBuildFile; fileRef = 797EF6900ED0EB5400B28F7A /* generate.c */; };
+ 797EF6950ED0EB5400B28F7A /* markdown.c in Sources */ = {isa = PBXBuildFile; fileRef = 797EF6910ED0EB5400B28F7A /* markdown.c */; };
+ 797EF6960ED0EB5400B28F7A /* mkdio.c in Sources */ = {isa = PBXBuildFile; fileRef = 797EF6920ED0EB5400B28F7A /* mkdio.c */; };
79F7EF740AC39638003DAB4E /* MarkdownLiveApp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 79F7EF730AC39638003DAB4E /* MarkdownLiveApp.icns */; };
8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */; };
8D15AC2D0486D014006FF6A4 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B6FDCFA73011CA2CEA /* MainMenu.nib */; };
@@ -38,17 +38,17 @@
2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
32DBCF750370BD2300C91783 /* MarkdownLive_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkdownLive_Prefix.pch; sourceTree = "<group>"; };
- 79252FF10E8E080100DFAD98 /* generate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = generate.c; path = "discount-1.2.10/generate.c"; sourceTree = "<group>"; };
792530EE0E8F40F200DFAD98 /* discountWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = discountWrapper.h; sourceTree = "<group>"; };
792530EF0E8F40F200DFAD98 /* discountWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = discountWrapper.m; sourceTree = "<group>"; };
- 792530FA0E8F49CE00DFAD98 /* mkdio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mkdio.c; path = "discount-1.2.10/mkdio.c"; sourceTree = "<group>"; };
- 792530FE0E8F49E800DFAD98 /* markdown.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = markdown.c; path = "discount-1.2.10/markdown.c"; sourceTree = "<group>"; };
- 792531000E8F4A0900DFAD98 /* resource.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = resource.c; path = "discount-1.2.10/resource.c"; sourceTree = "<group>"; };
792531450E8F4CD800DFAD98 /* mkdioWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mkdioWrapper.h; sourceTree = "<group>"; };
792531460E8F4CD800DFAD98 /* mkdioWrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mkdioWrapper.c; sourceTree = "<group>"; };
792531490E8F4E4D00DFAD98 /* markdownWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = markdownWrapper.h; sourceTree = "<group>"; };
7925314A0E8F4E4D00DFAD98 /* markdownWrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = markdownWrapper.c; sourceTree = "<group>"; };
796A2AD70A20DCEE00440275 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
+ 797EF68F0ED0EB5400B28F7A /* resource.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = resource.c; path = "discount-1.3.0/resource.c"; sourceTree = "<group>"; };
+ 797EF6900ED0EB5400B28F7A /* generate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = generate.c; path = "discount-1.3.0/generate.c"; sourceTree = "<group>"; };
+ 797EF6910ED0EB5400B28F7A /* markdown.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = markdown.c; path = "discount-1.3.0/markdown.c"; sourceTree = "<group>"; };
+ 797EF6920ED0EB5400B28F7A /* mkdio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mkdio.c; path = "discount-1.3.0/mkdio.c"; sourceTree = "<group>"; };
79F7EF730AC39638003DAB4E /* MarkdownLiveApp.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = MarkdownLiveApp.icns; sourceTree = "<group>"; };
8D15AC360486D014006FF6A4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
8D15AC370486D014006FF6A4 /* MarkdownLive.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MarkdownLive.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -156,10 +156,10 @@
792531460E8F4CD800DFAD98 /* mkdioWrapper.c */,
792531490E8F4E4D00DFAD98 /* markdownWrapper.h */,
7925314A0E8F4E4D00DFAD98 /* markdownWrapper.c */,
- 792530FA0E8F49CE00DFAD98 /* mkdio.c */,
- 792530FE0E8F49E800DFAD98 /* markdown.c */,
- 79252FF10E8E080100DFAD98 /* generate.c */,
- 792531000E8F4A0900DFAD98 /* resource.c */,
+ 797EF68F0ED0EB5400B28F7A /* resource.c */,
+ 797EF6900ED0EB5400B28F7A /* generate.c */,
+ 797EF6910ED0EB5400B28F7A /* markdown.c */,
+ 797EF6920ED0EB5400B28F7A /* mkdio.c */,
);
name = discount;
sourceTree = "<group>";
@@ -224,13 +224,13 @@
files = (
8D15AC310486D014006FF6A4 /* MyDocument.m in Sources */,
8D15AC320486D014006FF6A4 /* main.m in Sources */,
- 79252FF20E8E080100DFAD98 /* generate.c in Sources */,
792530F00E8F40F200DFAD98 /* discountWrapper.m in Sources */,
- 792530FB0E8F49CE00DFAD98 /* mkdio.c in Sources */,
- 792530FF0E8F49E800DFAD98 /* markdown.c in Sources */,
- 792531010E8F4A0900DFAD98 /* resource.c in Sources */,
792531470E8F4CD800DFAD98 /* mkdioWrapper.c in Sources */,
7925314B0E8F4E4D00DFAD98 /* markdownWrapper.c in Sources */,
+ 797EF6930ED0EB5400B28F7A /* resource.c in Sources */,
+ 797EF6940ED0EB5400B28F7A /* generate.c in Sources */,
+ 797EF6950ED0EB5400B28F7A /* markdown.c in Sources */,
+ 797EF6960ED0EB5400B28F7A /* mkdio.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -307,7 +307,6 @@
C05733CC08A9546B00998B17 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
@@ -318,7 +317,6 @@
C05733CD08A9546B00998B17 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
View
@@ -46,7 +46,7 @@ - (void)windowControllerDidLoadNib:(NSWindowController*)controller_ {
static BOOL engagedAutosave = NO;
if (!engagedAutosave) {
engagedAutosave = YES;
- [[NSDocumentController sharedDocumentController] setAutosavingDelay:30.0];
+ [[NSDocumentController sharedDocumentController] setAutosavingDelay:5.0];
}
[super windowControllerDidLoadNib:controller_];
}
View
@@ -1 +0,0 @@
-1.2.10
@@ -1,5 +0,0 @@
-#! /bin/sh
-# script generated Fri Sep 26 12:00:59 CDT 2008 by configure.sh
-
-test -d "$1" || mkdir -p "$1"
-exit 0
@@ -1,22 +0,0 @@
-./echo "code blocks"
-
-rc=0
-MARKDOWN_FLAGS=
-
-./echo -n ' format for code block html ....... '
-
-SEP='
- this is
- code
-'
-
-count=`echo "$SEP" | ./markdown | wc -l`
-
-if [ $count -eq 3 ]; then
- ./echo "ok"
-else
- ./echo "FAILED"
- rc=1
-fi
-
-exit $rc
File renamed without changes.
File renamed without changes.
@@ -1,4 +1,4 @@
-CC=cc
+CC=cc -I. -L.
AR=/usr/bin/ar
RANLIB=/usr/bin/ranlib
@@ -8,10 +8,11 @@ LIBDIR=/usr/local/lib
INCDIR=/usr/local/include
PGMS=markdown
-SAMPLE_PGMS=mkd2html
+SAMPLE_PGMS=mkd2html makepage
SAMPLE_PGMS+= theme
MKDLIB=libmarkdown.a
-OBJS=mkdio.o markdown.o dumptree.o generate.o resource.o docheader.o version.o
+OBJS=mkdio.o markdown.o dumptree.o generate.o \
+ resource.o docheader.o version.o toc.o xmlpage.o
all: $(PGMS) $(SAMPLE_PGMS)
@@ -24,21 +25,21 @@ install.everything: install install.samples install.man
install.samples: $(SAMPLE_PGMS) install
/usr/bin/install -s -m 755 $(SAMPLE_PGMS) $(BINDIR)
- /Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.2.10/config.md $(MANDIR)/man1
+ /Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.3.0/config.md $(MANDIR)/man1
/usr/bin/install -m 444 theme.1 $(MANDIR)/man1
install.man:
- /Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.2.10/config.md $(MANDIR)/man3
+ /Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.3.0/config.md $(MANDIR)/man3
/usr/bin/install -m 444 mkd-functions.3 markdown.3 $(MANDIR)/man3
for x in mkd_text mkd_in mkd_string; do \
( echo '.\"' ; echo ".so man3/markdown.3" ) > $(MANDIR)/man3/$$x.3;\
done
for x in mkd_compile mkd_style mkd_generatehtml mkd_cleanup mkd_doc_title mkd_doc_author mkd_doc_date; do \
( echo '.\"' ; echo ".so man3/mkd-functions.3" ) > $(MANDIR)/man3/$$x.3; \
done
- /Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.2.10/config.md $(MANDIR)/man7
+ /Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.3.0/config.md $(MANDIR)/man7
/usr/bin/install -m 444 markdown.7 mkd-extensions.7 $(MANDIR)/man7
- /Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.2.10/config.md $(MANDIR)/man1
+ /Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.3.0/config.md $(MANDIR)/man1
/usr/bin/install -m 444 markdown.1 $(MANDIR)/man1
install.everything: install install.man
@@ -47,15 +48,18 @@ version.o: version.c VERSION
$(CC) -DVERSION=\"`cat VERSION`\" -c version.c
markdown: main.o $(MKDLIB)
- $(CC) -L. -o markdown main.o -lmarkdown
+ $(CC) -o markdown main.o -lmarkdown
# example programs
theme: theme.o $(MKDLIB)
- $(CC) -L. -o theme theme.o -lmarkdown
+ $(CC) -o theme theme.o -lmarkdown
mkd2html: mkd2html.o $(MKDLIB)
- $(CC) -L. -o mkd2html mkd2html.o -lmarkdown
+ $(CC) -o mkd2html mkd2html.o -lmarkdown
+
+makepage: makepage.c $(MKDLIB)
+ $(CC) -o makepage makepage.c -lmarkdown
main.o: main.c mkdio.h config.h
$(CC) -I. -c main.c
@@ -76,9 +80,11 @@ clean:
rm -f $(PGMS) $(SAMPLE_PGMS) *.o $(MKDLIB)
distclean spotless: clean
- rm -f Makefile version.c config.cmd config.sub config.h config.mak config.log config.md
+ rm -f Makefile version.c markdown.1 config.cmd config.sub config.h config.mak config.log config.md
markdown.o: markdown.c config.h cstring.h markdown.h
generate.o: generate.c config.h cstring.h markdown.h
dumptree.o: dumptree.c cstring.h markdown.h
mkdio.o: mkdio.c mkdio.h cstring.h config.h
+xmlpage.o: xmlpage.c mkdio.h cstring.h config.h
+toc.o: toc.c mkdio.h cstring.h config.h
@@ -1,4 +1,4 @@
-CC=@CC@
+CC=@CC@ -I. -L.
AR=@AR@
RANLIB=@RANLIB@
@@ -8,10 +8,11 @@ LIBDIR=@libdir@
INCDIR=@prefix@/include
PGMS=markdown
-SAMPLE_PGMS=mkd2html
+SAMPLE_PGMS=mkd2html makepage
@THEME@SAMPLE_PGMS+= theme
MKDLIB=libmarkdown.a
-OBJS=mkdio.o markdown.o dumptree.o generate.o resource.o docheader.o version.o @AMALLOC@
+OBJS=mkdio.o markdown.o dumptree.o generate.o \
+ resource.o docheader.o version.o toc.o xmlpage.o @AMALLOC@
all: $(PGMS) $(SAMPLE_PGMS)
@@ -47,15 +48,18 @@ version.o: version.c VERSION
$(CC) -DVERSION=\"`cat VERSION`\" -c version.c
markdown: main.o $(MKDLIB)
- $(CC) -L. -o markdown main.o -lmarkdown @LIBS@
+ $(CC) -o markdown main.o -lmarkdown @LIBS@
# example programs
@THEME@theme: theme.o $(MKDLIB)
-@THEME@ $(CC) -L. -o theme theme.o -lmarkdown @LIBS@
+@THEME@ $(CC) -o theme theme.o -lmarkdown @LIBS@
mkd2html: mkd2html.o $(MKDLIB)
- $(CC) -L. -o mkd2html mkd2html.o -lmarkdown @LIBS@
+ $(CC) -o mkd2html mkd2html.o -lmarkdown @LIBS@
+
+makepage: makepage.c $(MKDLIB)
+ $(CC) -o makepage makepage.c -lmarkdown @LIBS@
main.o: main.c mkdio.h config.h
$(CC) -I. -c main.c
@@ -82,3 +86,5 @@ markdown.o: markdown.c config.h cstring.h markdown.h
generate.o: generate.c config.h cstring.h markdown.h
dumptree.o: dumptree.c cstring.h markdown.h
mkdio.o: mkdio.c mkdio.h cstring.h config.h
+xmlpage.o: xmlpage.c mkdio.h cstring.h config.h
+toc.o: toc.c mkdio.h cstring.h config.h
File renamed without changes.
View
@@ -0,0 +1 @@
+1.3.0
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,5 +1,5 @@
/*
- * configuration for markdown, generated Fri Sep 26 12:00:58 CDT 2008
+ * configuration for markdown, generated Sun Nov 16 17:57:08 CST 2008
* by wolf@wolf-mbp.local
*/
#ifndef __AC_MARKDOWN_D
@@ -7,11 +7,11 @@ checking out the C compiler
checking for "volatile" keyword
checking for "const" keyword
defining WORD & DWORD scalar types
-/tmp/pd18341.c: In function ‘main’:
-/tmp/pd18341.c:13: warning: incompatible implicit declaration of built-in function ‘exit’
-/tmp/ngc18341.c: In function ‘main’:
-/tmp/ngc18341.c:5: warning: initialization makes pointer from integer without a cast
-/tmp/ngc18341.c:6: warning: initialization makes pointer from integer without a cast
+/tmp/pd8734.c: In function ‘main’:
+/tmp/pd8734.c:13: warning: incompatible implicit declaration of built-in function ‘exit’
+/tmp/ngc8734.c: In function ‘main’:
+/tmp/ngc8734.c:5: warning: initialization makes pointer from integer without a cast
+/tmp/ngc8734.c:6: warning: initialization makes pointer from integer without a cast
looking for header pwd.h
looking for the getpwuid function
looking for the srandom function
@@ -20,14 +20,15 @@ looking for the strcasecmp function
looking for the strncasecmp function
looking for the fchdir function
looking for header malloc.h
-test failed: command was cc -c -o /tmp/doto18341.o /tmp/ngc18341.c
+test failed: command was cc -c -o /tmp/doto8734.o /tmp/ngc8734.c
output:
-/tmp/ngc18341.c:2:20: error: malloc.h: No such file or directory
+/tmp/ngc8734.c:2:20: error: malloc.h: No such file or directory
offending sources:
-/tmp/ngc18341.c:
+/tmp/ngc8734.c:
/* AC_CHECK_HEADERS */
#include <malloc.h>
main() { }
sed is /usr/bin/sed
generating Makefile
generating version.c
+generating markdown.1
File renamed without changes.
View
@@ -0,0 +1,5 @@
+#! /bin/sh
+# script generated Sun Nov 16 17:57:09 CST 2008 by configure.sh
+
+test -d "$1" || mkdir -p "$1"
+exit 0
@@ -3,19 +3,20 @@ s;@CPPFLAGS@;;g
s;@INSTALL@;/usr/bin/install;g
s;@INSTALL_PROGRAM@;/usr/bin/install -s -m 755;g
s;@INSTALL_DATA@;/usr/bin/install -m 444;g
-s;@INSTALL_DIR@;/Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.2.10/config.md;g
+s;@INSTALL_DIR@;/Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.3.0/config.md;g
s;@CC@;cc;g
s;@AR@;/usr/bin/ar;g
s;@RANLIB@;/usr/bin/ranlib;g
s;@THEME@;;g
s;@TABSTOP@;4;g
s;@AMALLOC@;;g
+s;@STRICT@;.\";g
s;@LIBS@;;g
s;@CONFIGURE_FILES@;config.cmd config.sub config.h config.mak config.log config.md;g
-s;@GENERATED_FILES@;Makefile version.c;g
+s;@GENERATED_FILES@;Makefile version.c markdown.1;g
s;@CFLAGS@;-g;g
s;@LDFLAGS@;-g;g
-s;@srcdir@;/Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.2.10;g
+s;@srcdir@;/Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.3.0;g
s;@prefix@;/usr/local;g
s;@exedir@;/usr/local/bin;g
s;@sbindir@;/usr/local/sbin;g
File renamed without changes.
Oops, something went wrong.

0 comments on commit 3a391bc

Please sign in to comment.