Remove html folder from Makefiles, correct sources

This commit is contained in:
Xavier Mendez 2013-09-20 17:08:29 +02:00
parent ac22b09a91
commit 546c1e1126
2 changed files with 13 additions and 12 deletions

View file

@ -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 $@ $<

View file

@ -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