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
|
--- Makefile.orig 2013-03-02 21:22:20 UTC
+++ Makefile
@@ -11,7 +11,7 @@ MAJOR=1
MINOR=30
RELEASE=$(MAJOR).$(MINOR)
-CC = gcc
+CC ?= gcc
ifndef PREFIX
PREFIX=/usr/local
@@ -38,7 +38,7 @@ ifeq ($(ARCH),i686)
ARCH = x86
endif
-ifeq ($(ARCH),x86_64)
+ifeq ($(ARCH),amd64)
CFLAGS += -fPIC
endif
@@ -64,10 +64,10 @@ ifdef D_USE_FREELISTS
CFLAGS += -DUSE_FREELISTS
endif
-D_BUILD_VERSION = $(shell git show-ref 2> /dev/null | head -1 | cut -d ' ' -f 1)
-ifeq ($(D_BUILD_VERSION),)
+#D_BUILD_VERSION = $(shell git show-ref 2> /dev/null | head -1 | cut -d ' ' -f 1)
+#ifeq ($(D_BUILD_VERSION),)
D_BUILD_VERSION = $(shell cat D_BUILD_VERSION)
-endif
+#endif
CFLAGS += -DD_MAJOR_VERSION=$(MAJOR) -DD_MINOR_VERSION=$(MINOR) -DD_BUILD_VERSION=\"$(D_BUILD_VERSION)\"
CFLAGS += -Wall
@@ -94,7 +94,7 @@ TEST_FILES = d/parser_tests d/baseline $
PYTHON_FILES = d/python/Makefile d/python/*.py d/python/*.c d/python/*.h d/python/*.i d/python/README d/python/*.html d/python/contrib/d* d/python/tests/*.py
VERILOG_FILES = d/verilog/Makefile d/verilog/verilog.g d/verilog/README d/verilog/ambig.c \
d/verilog/main.c d/verilog/vparse.c d/verilog/vparse.h d/verilog/verilog_tests
-TAR_FILES = $(AUX_FILES) $(TEST_FILES) $(PYTHON_FILES) $(VERILOG_FILES) d/D_BUILD_VERSION \
+TAR_FILES = $(AUX_FILES) $(TEST_FILES) $(PYTHON_FILES) $(VERILOG_FILES) \
d/grammar.g d/sample.g d/my.g
LIB_SRCS = arg.c parse.c scan.c symtab.c util.c read_binary.c dparse_tree.c
@@ -141,7 +141,7 @@ endif
ALL_SRCS = $(MAKE_PARSER_SRCS) $(BASE_SAMPLE_PARSER_SRCS) $(LIB_SRCS) $(MK_LIB_SRCS)
-all: $(EXECS) $(LIBRARIES) D_BUILD_VERSION make_dparser.cat
+all: $(EXECS) $(LIBRARIES) make_dparser.cat
version:
echo $(OS_TYPE) $(OS_VERSION)
|
