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
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
|
--- a/libwulf/Makefile.am
+++ b/libwulf/Makefile.am
@@ -48,14 +48,14 @@
# Define parameters and directives needed in compile/link steps.
#========================================================================
# C Compiler
-CC = gcc
+CC ?= gcc
# Compile flags. -fpic creates "position independent code" for
# shared libraries!
-CFLAGS = -O3 -I/usr/include/libxml2 -I ../include $(DEFINES)
+CFLAGS += -I/usr/include/libxml2 -I ../include $(DEFINES)
# Linker flags
-LDFLAGS = -g -fpic --shared -Wl,-soname,$(PROGLIB_SONAME)
+LDFLAGS += -fpic --shared -Wl,-soname,$(PROGLIB_SONAME)
# Libraries
LIBS = -lpthread -lxml2 -lm
@@ -110,7 +110,7 @@
install: $(PROGLIB_SO_VERSION) $(PROGMAN)
(install -d $(libdir); \
install -m 755 $(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO_VERSION); \
- ln -sf $(libdir)/$(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO); \
+ ln -sf $(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO); \
install -d $(includedir)/wulfware; \
install -m 644 ../include/wulfware/*.h $(includedir)/wulfware; \
install -d $(prefix)/share/man/man3; \
--- a/wulf2html/Makefile.am
+++ b/wulf2html/Makefile.am
@@ -62,8 +62,7 @@
echo "Clean does nothing"
install : $(PROGRAM)
- (strip $(PROGRAM);\
- install -d $(prefix)/bin; \
+ (install -d $(prefix)/bin; \
install -m 755 $(PROGRAM) $(prefix)/bin; \
install -d $(sysconfdir); \
install -d $(sysconfdir)/init.d; \
--- a/wulflogger/Makefile.am
+++ b/wulflogger/Makefile.am
@@ -54,13 +54,13 @@
# Define parameters and directives needed in compile/link steps.
#========================================================================
# C Compiler
-CC = gcc
+CC ?= gcc
# Compile flags
-CFLAGS = -O3 -I/usr/include/libxml2 -I ../include $(DEFINES)
+CFLAGS += -I/usr/include/libxml2 -I ../include $(DEFINES)
# Linker flags
-LDFLAGS =
+LDFLAGS +=
# Libraries
LIBS = -L ../libwulf -lwulf -lpthread -lcurses -lxml2 -lm
@@ -108,8 +108,7 @@
- rm -f core $(PROGRAM) *.o $(PROGRAM).1.gz
install : $(PROGRAM)
- (strip $(PROGRAM);\
- install -d $(prefix)/bin; \
+ (install -d $(prefix)/bin; \
install -m 755 $(PROGRAM) $(prefix)/bin; \
install -d $(prefix)/share/man/man1; \
gzip -c -9 $(PROGRAM).1 > $(PROGRAM).1.gz; \
--- a/wulfstat/Makefile.am
+++ b/wulfstat/Makefile.am
@@ -54,13 +54,13 @@
# Define parameters and directives needed in compile/link steps.
#========================================================================
# C Compiler
-CC = gcc
+CC ?= gcc
# Compile flags
-CFLAGS = -O3 -I/usr/include/libxml2 -I ../include $(DEFINES)
+CFLAGS += -I/usr/include/libxml2 -I ../include $(DEFINES)
# Linker flags
-LDFLAGS =
+LDFLAGS +=
# Libraries
LIBS = -L ../libwulf -lwulf -lpthread -lcurses -lxml2 -lm
@@ -108,8 +108,7 @@
- rm -f core $(PROGRAM) *.o $(PROGRAM).1.gz
install : $(PROGRAM)
- (strip $(PROGRAM);\
- install -d $(prefix)/bin; \
+ (install -d $(prefix)/bin; \
install -m 755 $(PROGRAM) $(prefix)/bin; \
install -d $(prefix)/share/man/man1; \
gzip -c -9 $(PROGRAM).1 > $(PROGRAM).1.gz; \
--- a/xmlsysd/Makefile.am
+++ b/xmlsysd/Makefile.am
@@ -60,13 +60,13 @@
# Define parameters and directives needed in compile/link steps.
#========================================================================
# C Compiler
-CC = gcc
+CC ?= gcc
# Compile flags
-CFLAGS = -O3 -I/usr/include/libxml2 $(DEFINES)
+CFLAGS += -I/usr/include/libxml2 $(DEFINES)
# Linker flags
-LDFLAGS =
+LDFLAGS +=
# Libraries
LIBS = -lxml2 -lz -lm
@@ -79,7 +79,7 @@
all: $(PROGRAM)
$(PROGRAM): $(OBJECTS) $(INCLUDES)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(OBJECTS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
#========================================================================
# The only safe place to do commits is in the toplevel directory
@@ -109,8 +109,7 @@
# Application installation.
#========================================================================
install : $(PROGRAM)
- (strip $(PROGRAM); \
- install -d $(sbindir); \
+ (install -d $(sbindir); \
install -m 755 $(PROGRAM) $(sbindir); \
install -d $(sysconfdir); \
install -d $(sysconfdir)/xinetd.d; \
|
GitWeb