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
103
104
105
106
107
108
|
* link against dev-libs/libmix
* parallel $(MAKE)
* usr/local/ -> usr/
* LDFLAGS
* verbose CC
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,14 +7,14 @@
# # #### # # #
# Change me if you want...
-INSTALL_PATH=/usr/local/bin
-MAN_PATH=/usr/local/man
+INSTALL_PATH=/usr/bin
+MAN_PATH=/usr/man
# If you change this, change src/lang.h as well
-DATA_PATH=/usr/local/share/nsat
+DATA_PATH=/usr/share/nsat
all:
- @cd src;make all
+ @cd src; $(MAKE) all
@echo ""
@echo " Compiling is done!"
@echo " You can now 'make install' to put the files in place."
@@ -58,5 +58,5 @@
doc/nsat.8:
@echo "Hmm, can't find manpage -- skipping :/"
-nsat:
- @make all
+nsat: src
+ $(MAKE) all
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -21,22 +21,22 @@
MIXOBJ = libmix++/net/net.o libmix++/misc/misc.o libmix++/misc/exclude.o
-all: ../smb-ns $(OBJ) modobj mixobj ../nsat
+all: ../smb-ns $(OBJ) modobj ../nsat
../smb-ns:
- @cd smb ; make smb
+ @cd smb ; $(MAKE) smb
-mixobj: libmix++/Makefile
- @cd libmix++ ; make
+#mixobj: libmix++/Makefile
+# @cd libmix++ ; $(MAKE)
-libmix++/Makefile:
- @cd .. ; ./configure
+#libmix++/Makefile:
+# @cd .. ; ./configure
modobj:
- @cd mod ; make modobj
+ @cd mod ; $(MAKE) modobj
-../nsat:
- ${GPP} ${CFLAGS} ${OBJ} ${MODOBJ} ${MIXOBJ} -o ../nsat ${CLIB}
+../nsat: modobj
+ ${GPP} ${CFLAGS} ${LDFLAGS} ${OBJ} ${MODOBJ} ${MIXOBJ} -o ../nsat ${CLIB}
pidalloc.o:
${GPP} ${CFLAGS} -c pidalloc.cpp
@@ -63,11 +63,11 @@
${GPP} ${CFLAGS} -c Logging.cpp
clean:
- cd mod && make clean
+ cd mod && $(MAKE) clean
rm -f core *.o ../*.log *.log *~ ../nsat ../.nsrc ../.nspid
distclean: clean
- @cd mod ; make clean
- @cd smb ; make clean
- @cd libmix++ ; make clean
+ @cd mod ; $(MAKE) clean
+ @cd smb ; $(MAKE) clean
+ @cd libmix++ ; $(MAKE) clean
rm -f mod/Makefile Makefile
--- a/src/smb/Makefile.in
+++ b/src/smb/Makefile.in
@@ -11,7 +11,6 @@
LIBDIR = $(BASEDIR)/lib
VARDIR = $(BASEDIR)/var
INSTALLPERMS = 0755
-FLAGS1 = -O3
LIBS1 =
SHELL = /bin/sh
srcdir = ./
@@ -53,10 +52,10 @@
.SUFFIXES: .c .o .h
.c.o: $(INCLUDES)
- @$(CC) $(CFLAGS) -c $(srcdir)$*.c -o $(srcdir)$*.o
+ $(CC) $(CFLAGS) $(LDFLAGS) -c $(srcdir)$*.c -o $(srcdir)$*.o
smb: msg $(CLIENT_OBJ) $(ARCFOUR_OBJ)
- @$(CC) $(CFLAGS) -o $(BINARY) $(CLIENT_OBJ) $(ARCFOUR_OBJ) $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(BINARY) $(CLIENT_OBJ) $(ARCFOUR_OBJ) $(LIBS)
@echo done
msg:
|
GitWeb