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
|
--- Makefile 2012-05-05 17:08:42.000000000 +0200
+++ Makefile 2012-06-17 16:59:29.289745982 +0200
@@ -18,26 +18,27 @@ else
FINALNOTES=Build complete.
endif
-CFLAGS ?= -Wall -O3 -include GLibFacade.h -I ./ -D MD_USE_GET_OPT=1
+OFLAGS = $(CFLAGS)
+LDFLAGS += -include GLibFacade.h -I ./ -D MD_USE_GET_OPT=1
ifeq ($(UNAME), SunOS)
CC = gcc
# Use of <stdbool.h> is valid only in a c99 compilation environment
- CFLAGS += --std=c99
+ OFLAGS += --std=c99
else
- CFLAGS += -ansi
+ OFLAGS += -ansi
endif
# make ARCH=ppc
# build for ppc architecture - Only works on machines with PPC compilation support installed
# probably only Snow Leopard machines with Xcode 3 installed
ifeq ($(ARCH), ppc)
- CFLAGS += -arch ppc
+ OFLAGS += -arch ppc
endif
# make ARCH=i386
# build for i386 architecture - useful with older machines or those running 10.4?
ifeq ($(ARCH), i386)
- CFLAGS += -arch i386
+ OFLAGS += -arch i386
endif
OBJS=markdown_parser.o markdown_output.o markdown_lib.o GLibFacade.o
@@ -49,18 +50,18 @@ PKG_CONFIG = pkg-config
ALL : $(PROGRAM)
$(PEGDIR):
- cp -r $(PEGDIR_ORIG) $(PEGDIR) ; \
- patch -p1 < peg-memory-fix.patch ; \
- patch -p1 < peg-exe-ext.patch
+ # cp -r $(PEGDIR_ORIG) $(PEGDIR) ; \
+ # patch -p1 < peg-memory-fix.patch ; \
+ # patch -p1 < peg-exe-ext.patch
$(LEG): $(PEGDIR)
CC=gcc $(MAKE) -C $(PEGDIR)
%.o : %.c markdown_peg.h
- $(CC) -c $(CFLAGS) -o $@ $<
+ $(CC) -c $(OFLAGS) -o $@ $<
$(PROGRAM) : markdown.c $(OBJS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $<
+ $(CC) $(OFLAGS) $(LDFLAGS) -o $@ $(OBJS) $<
@echo "$(FINALNOTES)"
markdown_parser.c : markdown_parser.leg $(LEG) markdown_peg.h parsing_functions.c utility_functions.c
--- peg/Makefile 2012-06-17 17:07:40.089725367 +0200
+++ peg/Makefile 2012-06-17 17:00:54.691742397 +0200
@@ -1,5 +1,6 @@
-CFLAGS = -g -Wall $(OFLAGS) $(XFLAGS)
-OFLAGS = -O3 -DNDEBUG
+# CFLAGS = -g -Wall $(OFLAGS) $(XFLAGS)
+# OFLAGS = -O3 -DNDEBUG
+CFLAGS += -DNDEBUG
#OFLAGS = -pg
OBJS = tree.o compile.o
--- peg/examples/Makefile 2012-06-17 17:07:40.089725367 +0200
+++ peg/examples/Makefile 2012-06-17 17:02:10.977739219 +0200
@@ -1,6 +1,6 @@
EXAMPLES = test rule accept wc dc dcv calc basic
-CFLAGS = -g -O3
+CFLAGS += -g
DIFF = diff
TEE = cat >
--- peg-0.1.4/Makefile 2012-06-17 17:07:40.093725369 +0200
+++ peg-0.1.4/Makefile 2012-06-17 17:01:27.767741069 +0200
@@ -1,8 +1,9 @@
PEG = peg$(X)
LEG = leg$(X)
-CFLAGS = -g -Wall $(OFLAGS) $(XFLAGS)
-OFLAGS = -O3 -DNDEBUG
+# CFLAGS = -g -Wall $(OFLAGS) $(XFLAGS)
+# OFLAGS = -O3 -DNDEBUG
+CFLAGS += -DNDEBUG
#OFLAGS = -pg
OBJS = tree.o compile.o
--- peg-0.1.4/examples/Makefile 2012-05-05 17:08:42.000000000 +0200
+++ peg-0.1.4/examples/Makefile 2012-06-17 17:02:27.055738544 +0200
@@ -1,6 +1,6 @@
EXAMPLES = test rule accept wc dc dcv calc basic
-CFLAGS = -g -O3
+CFLAGS += -g
DIFF = diff
TEE = cat >
|
GitWeb