From 546c1e1126c07295d2f73317df4b33cbf27d01ed Mon Sep 17 00:00:00 2001
From: Xavier Mendez <jmendeth@gmail.com>
Date: Fri, 20 Sep 2013 17:08:29 +0200
Subject: [PATCH] Remove html folder from Makefiles, correct sources

---
 Makefile     | 12 ++++++------
 Makefile.win | 13 +++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index d340f67..17c8db8 100644
--- a/Makefile
+++ b/Makefile
@@ -19,18 +19,18 @@ DEPDIR=depends
 # "Machine-dependant" options
 #MFLAGS=-fPIC
 
-CFLAGS=-c -g -O3 -fPIC -Wall -Werror -Wsign-compare -Isrc -Ihtml
+CFLAGS=-c -g -O3 -fPIC -Wall -Werror -Wsign-compare -Isrc
 LDFLAGS=-g -O3 -Wall -Werror 
 
 
 HOEDOWN_SRC=\
-	src/markdown.o \
-	src/stack.o \
-	src/buffer.o \
 	src/autolink.o \
+	src/buffer.o \
 	src/escape.o \
 	src/html.o \
 	src/html_smartypants.o \
+	src/markdown.o \
+	src/stack.o
 
 all:		libhoedown.so hoedown smartypants html_blocks
 
@@ -64,7 +64,7 @@ test: hoedown
 
 # housekeeping
 clean:
-	rm -f src/*.o html/*.o examples/*.o
+	rm -f src/*.o examples/*.o
 	rm -f libhoedown.so libhoedown.so.1 hoedown smartypants
 	rm -f hoedown.exe smartypants.exe
 	rm -rf $(DEPDIR)
@@ -77,7 +77,7 @@ include $(wildcard $(DEPDIR)/*.d)
 
 # generic object compilations
 
-%.o:	src/%.c examples/%.c html/%.c
+%.o:	src/%.c examples/%.c
 	@mkdir -p $(DEPDIR)
 	@$(CC) -MM $< > $(DEPDIR)/$*.d
 	$(CC) $(CFLAGS) -o $@ $<
diff --git a/Makefile.win b/Makefile.win
index 4c925b2..5c6f7cf 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,14 +1,15 @@
 
-CFLAGS=/O2 /EHsc /I"src/" /I"examples"/ /I"html"/
+CFLAGS=/O2 /EHsc /I"src/" /I"examples"/
 CC=cl
 
 HOEDOWN_SRC=\
-	src\markdown.obj \
-	src\stack.obj \
-	src\buffer.obj \
 	src\autolink.obj \
-	html\escape.obj \
-	html\html.obj
+	src\buffer.obj \
+	src\escape.obj \
+	src\html.obj \
+	src\html_smartpants.obj \
+	src\markdown.obj \
+	src\stack.obj
 
 all: hoedown.dll hoedown.exe