History

cleanup makefiles

grischka committed 17 years ago

Commit 15626621 parent e9e89ad2 files · +82 −72Browse files

Unified · Split

2 files
  1. Makefile +80 −70
  2. tests/Makefile +2 −2
Makefile+80−70
@@ -5,22 +5,7 @@ · 4 unmodified lines
5TOP ?= .5TOP ?= .
6include $(TOP)/config.mak6include $(TOP)/config.mak
7 7
8TARGET=
9CFLAGS+=-g -Wall8CFLAGS+=-g -Wall
10ifeq ($(ARCH),x86-64)
11TARGET=-DTCC_TARGET_X86_64
12CFLAGS+=-Wno-pointer-sign
13endif
14
15ifndef CONFIG_WIN32
16LIBS=-lm
17ifndef CONFIG_NOLDL
18LIBS+=-ldl
19endif
20ifneq ($(ARCH),x86-64)
21BCHECK_O=bcheck.o
22endif
23endif
24CFLAGS_P=$(CFLAGS) -pg -static -DCONFIG_TCC_STATIC9CFLAGS_P=$(CFLAGS) -pg -static -DCONFIG_TCC_STATIC
25LIBS_P=10LIBS_P=
26 11
@@ -40,94 +25,120 @@ endif · 13 unmodified lines
40endif25endif
41endif26endif
42 27
28ifeq ($(ARCH),x86-64)
29CFLAGS+=-Wno-pointer-sign
30endif
31
32ifndef CONFIG_WIN32
33LIBS=-lm
34ifndef CONFIG_NOLDL
35LIBS+=-ldl
36endif
37endif
38
39ifdef CONFIG_WIN32
40NATIVE_TARGET=-DTCC_TARGET_PE
41LIBTCC1=libtcc1.a
42else
43ifeq ($(ARCH),i386)
44NATIVE_TARGET=-DTCC_TARGET_I386
45LIBTCC1=libtcc1.a
46BCHECK_O=bcheck.o
47else
48ifeq ($(ARCH),arm)
49NATIVE_TARGET=-DTCC_TARGET_ARM
50NATIVE_TARGET+=$(if $(wildcard /lib/ld-linux.so.3),-DTCC_ARM_EABI)
51NATIVE_TARGET+=$(if $(shell grep -l "^Features.* \(vfp\|iwmmxt\) " /proc/cpuinfo),-DTCC_ARM_VFP)
52else
53ifeq ($(ARCH),x86-64)
54NATIVE_TARGET=-DTCC_TARGET_X86_64
55LIBTCC1=libtcc1.a
56endif
57endif
58endif
59endif
60
61ifdef CONFIG_USE_LIBGCC
62LIBTCC1=
63endif
64
43ifeq ($(TOP),.)65ifeq ($(TOP),.)
44 66
45PROGS=tcc$(EXESUF)67PROGS=tcc$(EXESUF)
46 68
47ARM_CROSS = arm-tcc-fpa$(EXESUF) arm-tcc-fpa-ld$(EXESUF) arm-tcc-vfp$(EXESUF) arm-tcc-vfp-eabi$(EXESUF)
48I386_CROSS = i386-tcc$(EXESUF)69I386_CROSS = i386-tcc$(EXESUF)
49WIN32_CROSS = i386-win32-tcc$(EXESUF)70WIN32_CROSS = i386-win32-tcc$(EXESUF)
50C67_CROSS = c67-tcc$(EXESUF)
51X64_CROSS = x86_64-tcc$(EXESUF)71X64_CROSS = x86_64-tcc$(EXESUF)
72ARM_CROSS = arm-tcc-fpa$(EXESUF) arm-tcc-fpa-ld$(EXESUF) \
73 arm-tcc-vfp$(EXESUF) arm-tcc-vfp-eabi$(EXESUF)
74C67_CROSS = c67-tcc$(EXESUF)
75
76CORE_FILES = tcc.c tccelf.c tccasm.c tcctok.h libtcc.h config.h
77I386_FILES = $(CORE_FILES) i386-gen.c i386-asm.c i386-asm.h
78WIN32_FILES = $(CORE_FILES) i386-gen.c i386-asm.c i386-asm.h tccpe.c
79X86_64_FILES = $(CORE_FILES) x86_64-gen.c
80ARM_FILES = $(CORE_FILES) arm-gen.c
81C67_FILES = $(CORE_FILES) c67-gen.c tcccoff.c
52 82
53ifdef CONFIG_WIN3283ifdef CONFIG_WIN32
54PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF)84PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF)
85NATIVE_FILES=$(WIN32_FILES)
55PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(C67_CROSS)86PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(C67_CROSS)
56 87else
57else ifeq ($(ARCH),i386)88ifeq ($(ARCH),i386)
89NATIVE_FILES=$(I386_FILES)
58PROGS_CROSS=$(X64_CROSS) $(WIN32_CROSS) $(ARM_CROSS) $(C67_CROSS)90PROGS_CROSS=$(X64_CROSS) $(WIN32_CROSS) $(ARM_CROSS) $(C67_CROSS)
59 91else
60else ifeq ($(ARCH),arm)92ifeq ($(ARCH),x86-64)
61PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(C67_CROSS)93NATIVE_FILES=$(X86_64_FILES)
62
63else ifeq ($(ARCH),x86-64)
64PROGS_CROSS=$(I386_CROSS) $(WIN32_CROSS) $(ARM_CROSS) $(C67_CROSS)94PROGS_CROSS=$(I386_CROSS) $(WIN32_CROSS) $(ARM_CROSS) $(C67_CROSS)
95else
96ifeq ($(ARCH),arm)
97NATIVE_FILES=$(ARM_FILES)
98PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(C67_CROSS)
99endif
100endif
101endif
65endif102endif
66 103
67ifdef CONFIG_CROSS104ifdef CONFIG_CROSS
68PROGS+=$(PROGS_CROSS)105PROGS+=$(PROGS_CROSS)
69endif106endif
70 107
71ifndef CONFIG_USE_LIBGCC
72LIBTCC1=libtcc1.a
73endif
74
75all: $(PROGS) $(LIBTCC1) $(BCHECK_O) libtcc.a tcc-doc.html tcc.1 libtcc_test$(EXESUF)108all: $(PROGS) $(LIBTCC1) $(BCHECK_O) libtcc.a tcc-doc.html tcc.1 libtcc_test$(EXESUF)
76 109
77TCC_CORE_FILES = tcc.c tccelf.c tccasm.c tcctok.h libtcc.h config.h
78
79# Host Tiny C Compiler110# Host Tiny C Compiler
80ifdef CONFIG_WIN32111tcc$(EXESUF): $(NATIVE_FILES)
81tcc$(EXESUF): $(TCC_CORE_FILES) i386-gen.c i386-asm.c i386-asm.h tccpe.c112 $(CC) -o $@ $< $(NATIVE_TARGET) $(CFLAGS) $(LIBS)
82 $(CC) -o $@ $< -DTCC_TARGET_PE $(CFLAGS) $(LIBS)
83
84else ifeq ($(ARCH),i386)
85tcc$(EXESUF): $(TCC_CORE_FILES) i386-gen.c i386-asm.c i386-asm.h
86 $(CC) -o $@ $< $(CFLAGS) $(LIBS)
87
88else ifeq ($(ARCH),x86-64)
89tcc$(EXESUF): $(TCC_CORE_FILES) x86_64-gen.c
90 $(CC) -o $@ $< -DTCC_TARGET_X86_64 $(CFLAGS) $(LIBS)
91
92else ifeq ($(ARCH),arm)
93ARMFLAGS = $(if $(wildcard /lib/ld-linux.so.3),-DTCC_ARM_EABI)
94ARMFLAGS += $(if $(shell grep -l "^Features.* \(vfp\|iwmmxt\) " /proc/cpuinfo),-DTCC_ARM_VFP)
95tcc$(EXESUF): $(TCC_CORE_FILES) arm-gen.c
96 $(CC) -o $@ $< -DTCC_TARGET_ARM $(ARMFLAGS) $(CFLAGS) $(LIBS)
97endif
98 113
99# Cross Tiny C Compilers114# Cross Tiny C Compilers
100i386-tcc$(EXESUF): $(TCC_CORE_FILES) i386-gen.c i386-asm.c i386-asm.h115i386-tcc$(EXESUF): $(I386_FILES)
101 $(CC) -o $@ $< $(CFLAGS) $(LIBS)116 $(CC) -o $@ $< -DTCC_TARGET_I386 $(CFLAGS) $(LIBS)
102 117
103i386-win32-tcc$(EXESUF): $(TCC_CORE_FILES) i386-gen.c i386-asm.c i386-asm.h tccpe.c118i386-win32-tcc$(EXESUF): $(WIN32_FILES)
104 $(CC) -o $@ $< -DTCC_TARGET_PE $(CFLAGS) $(LIBS)119 $(CC) -o $@ $< -DTCC_TARGET_PE $(CFLAGS) $(LIBS)
105 120
106x86_64-tcc$(EXESUF): $(TCC_CORE_FILES) x86_64-gen.c i386-asm.c i386-asm.h121x86_64-tcc$(EXESUF): $(X86_64_FILES)
107 $(CC) -o $@ $< -DTCC_TARGET_X86_64 $(CFLAGS) $(LIBS)122 $(CC) -o $@ $< -DTCC_TARGET_X86_64 $(CFLAGS) $(LIBS)
108 123
109c67-tcc$(EXESUF): $(TCC_CORE_FILES) c67-gen.c tcccoff.c124c67-tcc$(EXESUF): $(C67_FILES)
110 $(CC) -o $@ $< -DTCC_TARGET_C67 $(CFLAGS) $(LIBS)125 $(CC) -o $@ $< -DTCC_TARGET_C67 $(CFLAGS) $(LIBS)
111 126
112arm-tcc-fpa$(EXESUF): $(TCC_CORE_FILES) arm-gen.c127arm-tcc-fpa$(EXESUF): $(ARM_FILES)
113 $(CC) -o $@ $< -DTCC_TARGET_ARM $(CFLAGS) $(LIBS)128 $(CC) -o $@ $< -DTCC_TARGET_ARM $(CFLAGS) $(LIBS)
114 129
115arm-tcc-fpa-ld$(EXESUF): $(TCC_CORE_FILES) arm-gen.c130arm-tcc-fpa-ld$(EXESUF): $(ARM_FILES)
116 $(CC) -o $@ $< -DTCC_TARGET_ARM -DLDOUBLE_SIZE=12 $(CFLAGS) $(LIBS)131 $(CC) -o $@ $< -DTCC_TARGET_ARM -DLDOUBLE_SIZE=12 $(CFLAGS) $(LIBS)
117 132
118arm-tcc-vfp$(EXESUF): $(TCC_CORE_FILES) arm-gen.c133arm-tcc-vfp$(EXESUF): $(ARM_FILES)
119 $(CC) -o $@ $< -DTCC_TARGET_ARM -DTCC_ARM_VFP $(CFLAGS) $(LIBS)134 $(CC) -o $@ $< -DTCC_TARGET_ARM -DTCC_ARM_VFP $(CFLAGS) $(LIBS)
120 135
121arm-tcc-vfp-eabi$(EXESUF): $(TCC_CORE_FILES) arm-gen.c136arm-tcc-vfp-eabi$(EXESUF): $(ARM_FILES)
122 $(CC) -o $@ $< -DTCC_TARGET_ARM -DTCC_ARM_EABI $(CFLAGS) $(LIBS)137 $(CC) -o $@ $< -DTCC_TARGET_ARM -DTCC_ARM_EABI $(CFLAGS) $(LIBS)
123 138
124# libtcc generation and test139# libtcc generation and test
125libtcc.o: tcc.c i386-gen.c140libtcc.o: $(NATIVE_FILES)
126ifdef CONFIG_WIN32141 $(CC) -o $@ -c $< $(NATIVE_TARGET) -DLIBTCC $(CFLAGS)
127 $(CC) -o $@ -c $< -DTCC_TARGET_PE -DLIBTCC $(CFLAGS)
128else
129 $(CC) -o $@ -c $< $(TARGET) -DLIBTCC $(CFLAGS)
130endif
131 142
132libtcc.a: libtcc.o143libtcc.a: libtcc.o
133 $(AR) rcs $@ $^144 $(AR) rcs $@ $^
@@ -139,8 +150,8 @@ libtest: libtcc_test$(EXESUF) $(LIBTCC1) · 5 unmodified lines
139 ./libtcc_test$(EXESUF) lib_path=.150 ./libtcc_test$(EXESUF) lib_path=.
140 151
141# profiling version152# profiling version
142tcc_p: tcc.c153tcc_p$(EXESUF): $(NATIVE_FILES)
143 $(CC) -o $@ $< $(CFLAGS_P) $(LIBS_P)154 $(CC) -o $@ $< $(NATIVE_TARGET) $(CFLAGS_P) $(LIBS_P)
144 155
145# windows utilities156# windows utilities
146tiny_impdef$(EXESUF): win32/tools/tiny_impdef.c157tiny_impdef$(EXESUF): win32/tools/tiny_impdef.c
@@ -163,7 +174,7 @@ LIBTCC1_OBJS+=alloca86.o alloca86-bt.o · 16 unmodified lines
163endif174endif
164 175
165%.o: %.c176%.o: %.c
166 $(LIBTCC1_CC) -o $@ -c $< -O2 -Wall177 $(LIBTCC1_CC) -o $@ -c $< -O2 -Wall
167 178
168%.o: %.S179%.o: %.S
169 $(LIBTCC1_CC) -o $@ -c $<180 $(LIBTCC1_CC) -o $@ -c $<
@@ -220,7 +231,7 @@ install: $(PROGS) $(LIBTCC1) libtcc.a tcc-doc.html · 50 unmodified lines
220 cp -r win32/include/. "$(tccdir)/include"231 cp -r win32/include/. "$(tccdir)/include"
221 cp -r win32/examples/. "$(tccdir)/examples"232 cp -r win32/examples/. "$(tccdir)/examples"
222 $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include"233 $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include"
223 $(INSTALL) -m644 tcc-doc.html win32/tcc-win32.txt"$(tccdir)/doc"234 $(INSTALL) -m644 tcc-doc.html win32/tcc-win32.txt "$(tccdir)/doc"
224 $(INSTALL) -m644 libtcc.a libtcc.h "$(tccdir)/libtcc"235 $(INSTALL) -m644 libtcc.a libtcc.h "$(tccdir)/libtcc"
225endif236endif
226 237
@@ -247,10 +258,9 @@ test clean : · 20 unmodified lines
247# clean258# clean
248clean: local_clean259clean: local_clean
249local_clean:260local_clean:
250 rm -vf $(PROGS) tcc_p tcc.pod *~ *.o *.a *.out libtcc_test$(EXESUF)261 rm -vf $(PROGS) tcc_p$(EXESUF) tcc.pod *~ *.o *.a *.out libtcc_test$(EXESUF)
251 262
252distclean: clean263distclean: clean
253 rm -vf config.h config.mak config.texi tcc.1 tcc-doc.html264 rm -vf config.h config.mak config.texi tcc.1 tcc-doc.html
254 265
255endif266endif # ifeq ($(TOP),.)
256# ifeq ($(TOP),.)
tests/Makefile+2−2
@@ -17,7 +17,7 @@ include $(TOP)/Makefile · 16 unmodified lines
17 17
18# run local version of tcc with local libraries and includes18# run local version of tcc with local libraries and includes
19TCC = ../tcc -B..19TCC = ../tcc -B..
20RUN_TCC = $(TARGET) -run ../tcc.c -B..20RUN_TCC = $(NATIVE_TARGET) -run ../tcc.c -B..
21DISAS=objdump -d21DISAS=objdump -d
22 22
23all test : $(TESTS)23all test : $(TESTS)
@@ -141,4 +141,4 @@ cache: tcc_g · 117 unmodified lines
141# clean141# clean
142clean:142clean:
143 rm -vf *~ *.o *.a *.bin *.i *.ref *.out *.out? *.gcc \143 rm -vf *~ *.o *.a *.bin *.i *.ref *.out *.out? *.gcc \
144 tcctest[1234] ex? libtcc_test tcc_g144 tcctest[1234] ex? libtcc_test$(EXESUF) tcc_g

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t