aboutsummaryrefslogtreecommitdiff
path: root/src/tools/linux
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/linux')
-rw-r--r--src/tools/linux/dump_syms/Makefile18
-rw-r--r--src/tools/linux/symupload/Makefile10
2 files changed, 15 insertions, 13 deletions
diff --git a/src/tools/linux/dump_syms/Makefile b/src/tools/linux/dump_syms/Makefile
index 87491996..8e969586 100644
--- a/src/tools/linux/dump_syms/Makefile
+++ b/src/tools/linux/dump_syms/Makefile
@@ -1,8 +1,7 @@
-CPP=g++
+CXX=g++
CC=gcc
-CPPFLAGS=-gstabs -I../../.. -Wall -D_REENTRANT
-LDFLAGS=-lssl
+CXXFLAGS=-gstabs -I../../.. -DNDEBUG -Wall -D_REENTRANT
.PHONY:all clean
@@ -10,19 +9,22 @@ BIN=dump_syms
all:$(BIN)
-DUMP_OBJ=dump_symbols.o guid_creator.o dump_syms.o file_id.o
+DUMP_OBJ=dump_symbols.o guid_creator.o dump_syms.o file_id.o md5.o
dump_syms:$(DUMP_OBJ)
- $(CPP) $(CPPFLAGS) $(LDFLAGS) -o $@ $^
+ $(CXX) $(CXXFLAGS) -o $@ $^
dump_symbols.o:../../../common/linux/dump_symbols.cc
- $(CPP) $(CPPFLAGS) -c $^
+ $(CXX) $(CXXFLAGS) -c $^
guid_creator.o:../../../common/linux/guid_creator.cc
- $(CPP) $(CPPFLAGS) -c $^
+ $(CXX) $(CXXFLAGS) -c $^
file_id.o:../../../common/linux/file_id.cc
- $(CPP) $(CPPFLAGS) -c $^
+ $(CXX) $(CXXFLAGS) -c $^
+
+md5.o:../../../common/linux/md5.c
+ $(CC) $(CXXFLAGS) -c $^
clean:
rm -f $(BIN) $(DUMP_OBJ)
diff --git a/src/tools/linux/symupload/Makefile b/src/tools/linux/symupload/Makefile
index 7d4257d8..1fb843ee 100644
--- a/src/tools/linux/symupload/Makefile
+++ b/src/tools/linux/symupload/Makefile
@@ -1,6 +1,6 @@
-CC=g++
+CXX=g++
-CPPFLAGS=-gstabs -I../../.. -Wall -D_REENTRANT
+CXXFLAGS=-gstabs -I../../.. -Wall -D_REENTRANT
.PHONY:all clean
@@ -12,13 +12,13 @@ DUMP_UPLOAD_OBJ=minidump_upload.o http_upload.o
SYM_UPLOAD_OBJ=sym_upload.o http_upload.o
minidump_upload:$(DUMP_UPLOAD_OBJ)
- $(CC) $(CPPFLAGS) `curl-config --libs` -o $@ $^
+ $(CXX) $(CXXFLAGS) `curl-config --libs` -o $@ $^
sym_upload:$(SYM_UPLOAD_OBJ)
- $(CC) $(CPPFLAGS) `curl-config --libs` -o $@ $^
+ $(CXX) $(CXXFLAGS) `curl-config --libs` -o $@ $^
http_upload.o:../../../common/linux/http_upload.cc
- $(CC) $(CPPFLAGS) `curl-config --cflags` -c $^
+ $(CXX) $(CXXFLAGS) `curl-config --cflags` -c $^
clean:
rm *.o $(BIN)