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
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
From: Teemu Ikonen <tpikonen@gmail.com>
Subject: Debian changes to Makefile
Forwarded: no
Last-Update: 2018-05-01
Git-Branch: p/makefile
Git-Diff: 66a57540910f16f96c69adfc49261a..3a50d9eb52463ba209f7f63a3e1352
Makefile | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
index 7a81dc8..5771f9e 100644
--- a/Makefile
+++ b/Makefile
@@ -44,9 +44,9 @@ RELEASE = 1.0.4
#
CC = gcc
ifneq ($(MSYSTEM),MINGW32)
-CFLAGS = -g -O2 -Wall -ansi -pedantic
+CFLAGS += -g -O2 -Wall -ansi -pedantic
else
-CFLAGS = -g -O2 -Wall
+CFLAGS += -g -O2 -Wall
endif
@@ -75,9 +75,10 @@ INC = $(ROOT)
EXAMPLES = $(ROOT)
TESTDATA = $(ROOT)
ifndef INSTALL_PREFIX
-INSTALL_PREFIX = /usr/local
+INSTALL_PREFIX = $(DESTDIR)/usr
#INSTALL_PREFIX = $(HOME)
endif
+INSTALL_LIB ?= lib
#
# Include directories
@@ -88,11 +89,11 @@ else
INCLUDES = -I$(INC)
endif
-COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
-LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib
-BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
-BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -shared -I $(INSTALL_PREFIX)/include
-BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALL_PREFIX)/include
+COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
+LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -no-undefined -rpath /usr/$(INSTALL_LIB) $(LDFLAGS)
+BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(LDFLAGS)
+BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) -shared -I $(INSTALL_PREFIX)/include $(LDFLAGS)
+BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) -static -I $(INSTALL_PREFIX)/include $(LDFLAGS)
INSTALL_COMMAND = $(LIBTOOL) --mode=install cp
INSTALL_FINISH_COMMAND = $(LIBTOOL) --mode=finish
@@ -184,22 +185,22 @@ all: $(LIB) $(BIN) $(SOURCE) $(HEADERS) \
$(LIB)/libCVector.$(LIB_EXT) \
$(BIN)/CVectorBasicTest
-install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include \
+install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/$(INSTALL_LIB) $(INSTALL_PREFIX)/include \
$(INC) $(LIB)/libCVector.$(LIB_EXT) $(INC)/CVector.h
- $(INSTALL_COMMAND) $(LIB)/libCVector.$(LIB_EXT) $(INSTALL_PREFIX)/lib/libCVector.$(LIB_EXT)
- $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/lib/libCVector.$(LIB_EXT)
+ $(INSTALL_COMMAND) $(LIB)/libCVector.$(LIB_EXT) $(INSTALL_PREFIX)/$(INSTALL_LIB)/libCVector.$(LIB_EXT)
+ $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/$(INSTALL_LIB)/libCVector.$(LIB_EXT)
-cp $(INSTALL_PREFIX)/include/CVector.h $(INSTALL_PREFIX)/include/CVector_old.h
cp $(INC)/CVector.h $(INSTALL_PREFIX)/include/CVector.h
chmod 644 $(INSTALL_PREFIX)/include/CVector.h
echo "Testing final install dynamic"
$(BUILD_COMMAND_DYNAMIC) $(EXAMPLES)/CVectorBasicTest.c \
- -L$(INSTALL_PREFIX)/lib -lCVector -o $(BIN)/CVectorBasicTest_dynamic
+ -L$(INSTALL_PREFIX)/$(INSTALL_LIB) -lCVector -o $(BIN)/CVectorBasicTest_dynamic
$(BIN)/CVectorBasicTest_dynamic > $(TESTDATA)/CVectorBasicTest_dynamic.lst
diff -b -c $(TESTDATA)/CVectorBasicTest_orig.lst \
$(TESTDATA)/CVectorBasicTest_dynamic.lst
echo "Testing final install static"
$(BUILD_COMMAND_STATIC) $(EXAMPLES)/CVectorBasicTest.c \
- -L$(INSTALL_PREFIX)/lib -lCVector -o $(BIN)/CVectorBasicTest_static
+ -L$(INSTALL_PREFIX)/$(INSTALL_LIB) -lCVector -o $(BIN)/CVectorBasicTest_static
$(BIN)/CVectorBasicTest_static > $(TESTDATA)/CVectorBasicTest_static.lst
diff -b -c $(TESTDATA)/CVectorBasicTest_orig.lst \
$(TESTDATA)/CVectorBasicTest_static.lst
@@ -212,8 +213,8 @@ install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include
$(INSTALL_PREFIX):
mkdir -p $(INSTALL_PREFIX)
-$(INSTALL_PREFIX)/lib: $(INSTALL_PREFIX)
- mkdir -p $(INSTALL_PREFIX)/lib
+$(INSTALL_PREFIX)/$(INSTALL_LIB): $(INSTALL_PREFIX)
+ mkdir -p $(INSTALL_PREFIX)/$(INSTALL_LIB)
$(INSTALL_PREFIX)/bin: $(INSTALL_PREFIX)
mkdir -p $(INSTALL_PREFIX)/bin
@@ -268,6 +269,7 @@ clean:
@-rm -f *.$(OBJ_EXT)
@-rm -f *.c.*
@-rm -rf .libs
+ @-rm -rf CVectorBasicTest_dynamic.lst CVectorBasicTest_static.lst
#
|
