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
|
diff -Nuar uftp-3.7.orig//makefile uftp-3.7/makefile
--- uftp-3.7.orig//makefile 2012-08-10 17:00:22.566403478 +0600
+++ uftp-3.7/makefile 2012-08-10 17:04:47.523386683 +0600
@@ -39,25 +39,26 @@
endif
# defaults
-CC = gcc
-OPTIONS=-g -Wall $(ENC_OPTS)
+CC ?= gcc
+OPTIONS=$(ENC_OPTS)
LDLIBS=-lc -lm $(CRYPT_LIB)
-CFLAGS=
+CFLAGS?=
+LDFLAGS?=
# FreeBSD
ifeq ("FreeBSD", "$(UNAME_S)")
-OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
endif
# OSX, aka Darwin
ifeq ("Darwin", "$(UNAME_S)")
-OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
endif
# Sun
ifeq ("SunOS", "$(UNAME_S)")
-CC = cc
-OPTIONS=-g -DBSD_COMP $(ENC_OPTS)
+CC ?= cc
+OPTIONS=-DBSD_COMP $(ENC_OPTS)
LDLIBS=-lnsl -lsocket -lm $(CRYPT_LIB)
CFLAGS=`getconf LFS_CFLAGS`
OPENSSL=/usr/sfw
@@ -65,9 +66,9 @@
# Linux
ifeq ("Linux", "$(UNAME_S)")
-OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
LDLIBS=-lm $(CRYPT_LIB)
-CFLAGS=`getconf LFS_CFLAGS`
+CFLAGS?=`getconf LFS_CFLAGS`
endif
ifdef OPENSSL
@@ -82,7 +83,7 @@
testclient_multi.o: testclient_multi.c uftp.h uftp_common.h encryption.h
testclient_multi: testclient_multi.o encrypt_openssl.o uftp_common.o
- $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
+ $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
clean:
rm -f testclient_multi uftp uftpd uftpproxyd uftp_keymgt *.o
@@ -176,16 +177,16 @@
endif
uftp: $(UFTP_OBJS)
- $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
+ $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
uftpd: $(UFTPD_OBJS)
- $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
+ $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
uftpproxyd: $(UFTPPROXYD_OBJS)
- $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
+ $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
uftp_keymgt: $(UFTP_KEYMGT_OBJS)
- $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
+ $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
%.o: %.c
$(CC) $(OPTIONS) $(INCLUDE) $(CFLAGS) -c $<
|
GitWeb