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
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
From 50d19845d34ce8df57b97d6484857ee14675f46e Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Sun, 18 May 2014 11:41:20 +0200
Subject: Fix build system
* Make verbose enough
* Actually honor CPPFLAGS and LDFLAGS
* Never link libstdc++
---
Makefile.in | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 89b5ab7..d2d2c91 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,7 +16,7 @@
# with thin-provisioning-tools. If not, see
# <http://www.gnu.org/licenses/>.
-V=@
+.PHONY: all
PROGRAMS=\
bin/pdata_tools
@@ -103,23 +103,26 @@ STRIP:=@STRIP@
OBJECTS:=$(subst .cc,.o,$(SOURCE))
TOP_DIR:=@top_srcdir@
TOP_BUILDDIR:=@top_builddir@
-CFLAGS+=-g -Wall -O3
+CFLAGS+=-g -Wall
+CFLAGS+=@CFLAGS@
CFLAGS+=@LFS_FLAGS@
+CPPFLAGS=@CPPFLAGS@
CXXFLAGS+=-g -Wall -fno-strict-aliasing
+CXXFLAGS+=@CXXFLAGS@
CXXFLAGS+=@CXXOPTIMISE_FLAG@
CXXFLAGS+=@CXXDEBUG_FLAG@
CXXFLAGS+=@CXX_STRERROR_FLAG@
CXXFLAGS+=@LFS_FLAGS@
CXXFLAGS+=@STATIC_LINK_FLAGS@
+LDFLAGS=@LDFLAGS@
LDFLAGS+=@STATIC_LINK_FLAGS@
INCLUDES+=-I$(TOP_BUILDDIR) -I$(TOP_DIR) -I$(TOP_DIR)/thin-provisioning
LIBS:=-laio -lexpat
-LIBS+=@DYNAMIC_LINK_FLAGS@
INSTALL:=@INSTALL@
-PREFIX:=@prefix@
-BINDIR:=$(DESTDIR)$(PREFIX)/sbin
-DATADIR:=$(DESTDIR)$(PREFIX)/share
-MANPATH:=$(DATADIR)/man
+prefix:=@prefix@
+exec_prefix:=@exec_prefix@
+BINDIR:=$(DESTDIR)@sbindir@
+MANPATH:=$(DESTDIR)@mandir@
vpath %.cc $(TOP_DIR)
@@ -138,22 +141,15 @@ endif
.SUFFIXES: .d
%.o: %.cc
- @echo " [CXX] $<"
- $(V) $(CXX) -c $(INCLUDES) $(CXXFLAGS) -o $@ $<
- @echo " [DEP] $<"
- $(V) $(CXX) -MM -MT $(subst .cc,.o,$<) $(INCLUDES) $(TEST_INCLUDES) $(CXXFLAGS) $< > $*.$$$$; \
- sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $* : Makefile ,g' < $*.$$$$ > $*.d; \
- $(RM) $*.$$$$
+ $(CXX) -c $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
#----------------------------------------------------------------
lib/libpdata.a: $(OBJECTS)
- @echo " [AR] $<"
- $(V)ar -rv $@ $(OBJECTS) > /dev/null 2>&1
+ ar -rv $@ $(OBJECTS) > /dev/null 2>&1
bin/pdata_tools: $(OBJECTS)
- @echo " [LD] $@"
- $(V) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS)
#----------------------------------------------------------------
|
