Skip to content

Commit 546f598

Browse files
author
Ognjen Sobajic
committed
Improving some makefiles: Locals visible when debuggin now on g++-4.8, Samples being recompiled only when source changed, g++ version only in one place (Makefile)
1 parent dd4488a commit 546f598

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

Release/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ release: MODE = Release$(shell getconf LONG_BIT)
1616
release: OUTPUT_DIR = $(PWD)/../Binaries/$(MODE)
1717
release: mk_out_dir tests samples
1818

19-
debug: OPTIMIZATION_LEVEL = -O0 -ggdb
19+
debug: OPTIMIZATION_LEVEL = -O0 -g -gdwarf-2
2020
debug: MODE = Debug$(shell getconf LONG_BIT)
2121
debug: OUTPUT_DIR = $(PWD)/../Binaries/$(MODE)
2222
debug: mk_out_dir tests samples
@@ -77,7 +77,7 @@ clean:
7777
@find . -iname *.o -exec rm '{}' \;
7878
@find ../Binaries -iname *.so -exec rm '{}' \;
7979
@find ../Binaries -iname *.txt -exec rm '{}' \;
80-
@find ../Binaries -iname blackjackclient -exec rm '{}' \;
81-
@find ../Binaries -iname blackjackserver -exec rm '{}' \;
80+
@find ../Binaries -iname SearchFile -exec rm '{}' \;
81+
@find ../Binaries -iname BingRequest -exec rm '{}' \;
8282
@find ../Binaries -iname syncdir -exec rm '{}' \;
8383
@find ../Binaries -iname test_runner -exec rm '{}' \;

Release/samples/BingRequest/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
$(OUTPUT_DIR)/BingRequest: bingrequest
2-
mv bingrequest $@
3-
4-
bingrequest: ../../collateral/Samples/BingRequest/bingrequest.cpp
1+
$(OUTPUT_DIR)/BingRequest: ../../collateral/Samples/BingRequest/bingrequest.cpp
52
$(CXX) $(BASE_CXXFLAGS) -I$(CASABLANCA_INCLUDE_DIR) $^ -o $@ -L$(OUTPUT_DIR) -lcasablanca -lboost_thread -Wno-sign-compare -Wno-unused-parameter

Release/samples/SearchFile/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
$(OUTPUT_DIR)/SearchFile: searchfile
2-
mv searchfile $@
3-
4-
searchfile: ../../collateral/Samples/SearchFile/searchfile.cpp
1+
$(OUTPUT_DIR)/SearchFile: ../../collateral/Samples/SearchFile/searchfile.cpp
52
$(CXX) $(BASE_CXXFLAGS) -I$(CASABLANCA_INCLUDE_DIR) $^ -o $@ -L$(OUTPUT_DIR) -lcasablanca -lboost_thread -Wno-sign-compare -Wno-unused-parameter

Release/src/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ CXXFLAGS = -fPIC -std=c++11 $(STRICT_BASE_CXXFLAGS) -I../include -I./pch $(WARNI
6363
LIBS = $(PKGCONFIG_LIBS) -lboost_system -lboost_thread -lboost_locale -pthread -lstdc++ -lm # these are explicit for clang
6464
LDFLAGS = $(BASE_LDFLAGS)
6565

66-
CXX ?= g++-4.8
67-
6866
ifeq ($(OUTPUT_DIR),)
6967
LIBRARY_DST=$(MODE)/$(LIBRARY)
7068
else

0 commit comments

Comments
 (0)