Skip to content

Commit

Permalink
Merge branch 'development' of https://git01.codeplex.com/casablanca i…
Browse files Browse the repository at this point in the history
…nto development
  • Loading branch information
arturl committed Nov 5, 2013
2 parents 53628b6 + c21e449 commit b5ccc39
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 7 deletions.
5 changes: 4 additions & 1 deletion Release/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ PCH = ./pch/stdafx.h

PRECOMPILED_HEADERS = $(addsuffix .gch, $(PCH))
OBJECTS = $(addsuffix .$(MODE).o, $(basename $(SOURCES)))
CPP_DEPENDENCIES = $(addsuffix .d, $(basename $(SOURCES)))

# flags for the C++ compiler

Expand All @@ -90,9 +91,11 @@ all: $(LIBRARY_DST)
@echo "Building precompiled header $(@)"
@$(CXX) -x c++-header $(CXXFLAGS) -c $< -o $@

-include $(CPP_DEPENDENCIES)

%.$(MODE).o: %.cpp
@echo "Compiling $< -> $@"
@$(CXX) $(CXXFLAGS) -c $< -o $@
@$(CXX) -MMD -MF $*.d $(CXXFLAGS) -c $< -o $@

$(PRECOMPILED_HEADERS): $(HEADERS)

Expand Down
4 changes: 3 additions & 1 deletion Release/tests/Functional/http/client/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ $(OUTPUT_DIR)/httpclient_test.so: $(OBJECTS)
@echo "Building library $@"
@$(CXX) -fPIC -shared $(CXXFLAGS) $(shell pkg-config libxml++-2.6 --cflags) $(LDFLAGS) $^ $(LDLIBS) -o $@

-include *.$(MODE).d

$(OBJECTS): %.$(MODE).o: %.cpp
@echo "Compiling $< -> $@"
@$(CXX) -fPIC $(CXXFLAGS) -c $< -o $@
@$(CXX) -fPIC $(CXXFLAGS) -MMD -MF $*.$(MODE).d -c $< -o $@
4 changes: 3 additions & 1 deletion Release/tests/Functional/http/listener/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ $(OUTPUT_DIR)/httplistener_test.so: $(OBJECTS)
@echo "Building library $@"
@$(CXX) -fPIC -shared $(CXXFLAGS) $(shell pkg-config libxml++-2.6 --cflags) $(LDFLAGS) $^ $(LDLIBS) -o $@

-include *.$(MODE).d

$(OBJECTS): %.$(MODE).o: %.cpp
@echo "Compiling $< -> $@"
@$(CXX) -fPIC $(CXXFLAGS) -c $< -o $@
@$(CXX) -fPIC $(CXXFLAGS) -MMD -MF $*.$(MODE).d -c $< -o $@
8 changes: 6 additions & 2 deletions Release/tests/Functional/http/utilities/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ LDLIBS=-lcasablanca -lunittestpp -lboost_system -lboost_thread -lboost_locale -l

OUTPUT_DIR?=./$(MODE)

$(OUTPUT_DIR)/libhttptest_utilities.so: \
FILENAME = $(OUTPUT_DIR)/libhttptest_utilities

-include $(FILENAME).d

$(FILENAME).so: \
http_asserts.cpp \
test_http_client.cpp \
test_http_server.cpp \
test_server_utilities.cpp
$(CXX) $(CXXFLAGS) -fPIC -shared $(shell pkg-config libxml++-2.6 --cflags) $(LDFLAGS) $^ $(LDLIBS) -o $@
$(CXX) $(CXXFLAGS) -fPIC -shared $(shell pkg-config libxml++-2.6 --cflags) $(LDFLAGS) -MMD -MF $(FILENAME).d $(filter %.cpp, $^) $(LDLIBS) -o $@
12 changes: 10 additions & 2 deletions Release/tests/Functional/json/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@ LDLIBS=-lcasablanca -lunittestpp -lboost_system -lboost_thread -lpthread -lstdc+

OUTPUT_DIR?=./$(MODE)

$(OUTPUT_DIR)/json_test.so: construction_tests.cpp negative_parsing_tests.cpp parsing_tests.cpp to_as_and_operators_tests.cpp
$(CXX) -fPIC -shared $(CXXFLAGS) $(shell pkg-config libxml++-2.6 --cflags) $(LDFLAGS) $^ $(LDLIBS) -o $@
FILENAME = $(OUTPUT_DIR)/json_test

-include $(FILENAME).d

$(FILENAME).so: \
construction_tests.cpp \
negative_parsing_tests.cpp \
parsing_tests.cpp \
to_as_and_operators_tests.cpp
$(CXX) -fPIC -shared $(CXXFLAGS) $(shell pkg-config libxml++-2.6 --cflags) $(LDFLAGS) -MMD -MF $(FILENAME).d $(filter %.cpp, $^) $(LDLIBS) -o $@


0 comments on commit b5ccc39

Please sign in to comment.