1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
--- autofdo-0.19.orig/Makefile.am
+++ autofdo-0.19/Makefile.am
@@ -1,14 +1,14 @@
## Process this file with automake to produce Makefile.in
PROTOBUF = third_party/protobuf
-PROTOBUF_DEP = $(PROTOBUF)/src/.libs/libprotobuf.a
-PROTOC = ./$(PROTOBUF)/src/protoc
+PROTOBUF_DEP = -lprotobuf
+PROTOC = protoc
$(PROTOBUF)/configure:
echo "[AUTOGEN] Preparing protobuf"
(cd $(PROTOBUF) ; autoreconf -f -i -Wall,no-obsolete)
-$(PROTOC) $(PROTOBUF)/src/.libs/libprotobuf.a: $(PROTOBUF)/configure
+$(PROTOBUF)/src/.libs/libprotobuf.a: $(PROTOBUF)/configure
echo "[MAKE] Building protobuf"
(cd third_party/protobuf/; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g $(PROTOBUF_LDFLAGS_EXTRA)" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g $(PROTOBUF_CPPFLAGS_EXTRA)" ./configure --disable-shared --enable-static $(PROTOBUF_CONFIG_OPTS))
make -C $(PROTOBUF)
@@ -23,12 +23,12 @@ protoc_outputs = \
third_party/perf_data_converter/src/quipper/perf_stat.pb.cc \
third_party/perf_data_converter/src/quipper/perf_stat.pb.h
-$(protoc_outputs): $(protoc_inputs) $(PROTOC)
+$(protoc_outputs): $(protoc_inputs)
$(PROTOC) --cpp_out=`dirname $<` -I`dirname $<` $(protoc_inputs)
ACLOCAL_AMFLAGS = -I m4
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/third_party/perf_data_converter/src/quipper -I./$(PROTOBUF)/src
-AM_CXXFLAGS = -std=gnu++11 -I./$(PROTOBUF)/src
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/third_party/perf_data_converter/src/quipper
+AM_CXXFLAGS = -std=gnu++11
LIBS += -lpthread
LIBELF = -lelf
|
