blob: 4f4ddac58b3bf7ff4e8fb536a0434d69e16c04b0 (
plain)
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
|
diff --git a/Makefile b/Makefile
index 79dda53..71f8d54 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@
# The following line (GLOBALCONF) is the only line you should need to edit!
-GLOBALCONF = /usr/share/boxes
+GLOBALCONF = /usr/share/boxes/boxes-config
BVERSION = 1.1
SNAPFILE = boxes-SNAP-$(shell date +%Y%m%d)
diff --git a/src/Makefile b/src/Makefile
index 7cfab9f..9ed467b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -86,8 +86,7 @@
LEX = flex
YACC = bison
CC = gcc
-CFLAGS = -ansi -I. -Iregexp -Wall -W $(CFLAGS_ADDTL)
-LDFLAGS = -Lregexp
+CFLAGS += -ansi -I. -Iregexp $(CFLAGS_ADDTL)
GEN_HDR = parser.h
GEN_SRC = parser.c lex.yy.c
@@ -106,14 +105,13 @@ ALL_OBJ = $(GEN_SRC:.c=.o) $(ORIG_NORM:.c=.o)
build:
- $(MAKE) CFLAGS_ADDTL=-O boxes
- strip boxes
+ $(MAKE) boxes
debug:
$(MAKE) CFLAGS_ADDTL=-g boxes
boxes: $(ALL_OBJ)
$(MAKE) -C regexp CC=$(CC) libregexp.a
- $(CC) $(LDFLAGS) $(ALL_OBJ) -o boxes -lregexp
+ $(CC) $(LDFLAGS) $(ALL_OBJ) -o boxes -Lregexp -lregexp
boxes.h:
@echo File boxes.h not found or not current. Please run make in the parent directory.
diff --git a/src/regexp/Makefile b/src/regexp/Makefile
index 0bd0ace..53966c9 100644
--- a/src/regexp/Makefile
+++ b/src/regexp/Makefile
@@ -42,7 +42,7 @@
#============================================================================
-CFLAGS = -O -I. $(CFLAGS_ADDTL)
+CFLAGS += -I. $(CFLAGS_ADDTL)
ALL_CL = regexp/regexp.c regexp/regsub.c
C_SRC = $(notdir $(ALL_CL))
|
GitWeb
