libsnowcrash.target.mk in redsnow-0.2.0

- old
+ new

@@ -34,12 +34,13 @@
 # Flags passed to only ObjC++ files.
 CFLAGS_OBJCC_Debug :=
 
 INCS_Debug := \
 	-I$(srcdir)/src \
-	-I$(srcdir)/sundown/src \
-	-I$(srcdir)/sundown/src/html
+	-I$(srcdir)/ext/markdown-parser/src \
+	-I$(srcdir)/ext/markdown-parser/ext/sundown/src \
+	-I$(srcdir)/ext/markdown-parser/ext/sundown/html
 
 DEFS_Release := \
 	'-DBUILDING_SNOWCRASH=1' \
 	'-D_DARWIN_USE_64_BIT_INODE=1'
 
@@ -69,34 +70,33 @@
 # Flags passed to only ObjC++ files.
 CFLAGS_OBJCC_Release :=
 
 INCS_Release := \
 	-I$(srcdir)/src \
-	-I$(srcdir)/sundown/src \
-	-I$(srcdir)/sundown/src/html
+	-I$(srcdir)/ext/markdown-parser/src \
+	-I$(srcdir)/ext/markdown-parser/ext/sundown/src \
+	-I$(srcdir)/ext/markdown-parser/ext/sundown/html
 
 OBJS := \
+	$(obj).target/$(TARGET)/src/CBlueprint.o \
+	$(obj).target/$(TARGET)/src/CSourceAnnotation.o \
 	$(obj).target/$(TARGET)/src/HTTP.o \
-	$(obj).target/$(TARGET)/src/MarkdownBlock.o \
-	$(obj).target/$(TARGET)/src/MarkdownParser.o \
-	$(obj).target/$(TARGET)/src/Parser.o \
-	$(obj).target/$(TARGET)/src/ParserCore.o \
+	$(obj).target/$(TARGET)/src/Section.o \
 	$(obj).target/$(TARGET)/src/Serialize.o \
 	$(obj).target/$(TARGET)/src/SerializeJSON.o \
 	$(obj).target/$(TARGET)/src/SerializeYAML.o \
-	$(obj).target/$(TARGET)/src/UriTemplateParser.o \
+	$(obj).target/$(TARGET)/src/Signature.o \
 	$(obj).target/$(TARGET)/src/snowcrash.o \
 	$(obj).target/$(TARGET)/src/csnowcrash.o \
-	$(obj).target/$(TARGET)/src/CBlueprint.o \
-	$(obj).target/$(TARGET)/src/CSourceAnnotation.o \
+	$(obj).target/$(TARGET)/src/UriTemplateParser.o \
 	$(obj).target/$(TARGET)/src/posix/RegexMatch.o
 
 # Add to the list of files we specially track dependencies for.
 all_deps += $(OBJS)
 
 # Make sure our dependencies are built before any of us.
-$(OBJS): | $(builddir)/libsundown.a
+$(OBJS): | $(builddir)/libmarkdownparser.a $(builddir)/libsundown.a
 
 # CFLAGS et al overrides must be target-local.
 # See "Target-specific Variable Values" in the GNU Make manual.
 $(OBJS): TOOLSET := $(TOOLSET)
 $(OBJS): GYP_CFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE))
@@ -142,12 +142,12 @@
 LIBS :=
 
 $(builddir)/libsnowcrash.dylib: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
 $(builddir)/libsnowcrash.dylib: LIBS := $(LIBS)
 $(builddir)/libsnowcrash.dylib: GYP_LIBTOOLFLAGS := $(LIBTOOLFLAGS_$(BUILDTYPE))
-$(builddir)/libsnowcrash.dylib: LD_INPUTS := $(OBJS) $(builddir)/libsundown.a
+$(builddir)/libsnowcrash.dylib: LD_INPUTS := $(OBJS) $(builddir)/libmarkdownparser.a $(builddir)/libsundown.a
 $(builddir)/libsnowcrash.dylib: TOOLSET := $(TOOLSET)
-$(builddir)/libsnowcrash.dylib: $(OBJS) $(builddir)/libsundown.a FORCE_DO_CMD
+$(builddir)/libsnowcrash.dylib: $(OBJS) $(builddir)/libmarkdownparser.a $(builddir)/libsundown.a FORCE_DO_CMD
 	$(call do_cmd,solink)
 
 all_deps += $(builddir)/libsnowcrash.dylib
 # Add target alias
 .PHONY: libsnowcrash