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
55 TOP ?= .
66 include $(TOP)/config.mak
77
8−TARGET=
98 CFLAGS+=-g -Wall
10−ifeq ($(ARCH),x86-64)
11−TARGET=-DTCC_TARGET_X86_64
12−CFLAGS+=-Wno-pointer-sign
13−endif
14−
15−ifndef CONFIG_WIN32
16−LIBS=-lm
17−ifndef CONFIG_NOLDL
18−LIBS+=-ldl
19−endif
20−ifneq ($(ARCH),x86-64)
21−BCHECK_O=bcheck.o
22−endif
23−endif
249 CFLAGS_P=$(CFLAGS) -pg -static -DCONFIG_TCC_STATIC
2510 LIBS_P=
2611
@@ -40,94 +25,120 @@ endif · 13 unmodified lines
4025 endif
4126 endif
4227
28+ifeq ($(ARCH),x86-64)
29+CFLAGS+=-Wno-pointer-sign
30+endif
31+
32+ifndef CONFIG_WIN32
33+LIBS=-lm
34+ifndef CONFIG_NOLDL
35+LIBS+=-ldl
36+endif
37+endif
38+
39+ifdef CONFIG_WIN32
40+NATIVE_TARGET=-DTCC_TARGET_PE
41+LIBTCC1=libtcc1.a
42+else
43+ifeq ($(ARCH),i386)
44+NATIVE_TARGET=-DTCC_TARGET_I386
45+LIBTCC1=libtcc1.a
46+BCHECK_O=bcheck.o
47+else
48+ifeq ($(ARCH),arm)
49+NATIVE_TARGET=-DTCC_TARGET_ARM
50+NATIVE_TARGET+=$(if $(wildcard /lib/ld-linux.so.3),-DTCC_ARM_EABI)
51+NATIVE_TARGET+=$(if $(shell grep -l "^Features.* \(vfp\|iwmmxt\) " /proc/cpuinfo),-DTCC_ARM_VFP)
52+else
53+ifeq ($(ARCH),x86-64)
54+NATIVE_TARGET=-DTCC_TARGET_X86_64
55+LIBTCC1=libtcc1.a
56+endif
57+endif
58+endif
59+endif
60+
61+ifdef CONFIG_USE_LIBGCC
62+LIBTCC1=
63+endif
64+
4365 ifeq ($(TOP),.)
4466
4567 PROGS=tcc$(EXESUF)
4668
47−ARM_CROSS = arm-tcc-fpa$(EXESUF) arm-tcc-fpa-ld$(EXESUF) arm-tcc-vfp$(EXESUF) arm-tcc-vfp-eabi$(EXESUF)
4869 I386_CROSS = i386-tcc$(EXESUF)
4970 WIN32_CROSS = i386-win32-tcc$(EXESUF)
50−C67_CROSS = c67-tcc$(EXESUF)
5171 X64_CROSS = x86_64-tcc$(EXESUF)
72+ARM_CROSS = arm-tcc-fpa$(EXESUF) arm-tcc-fpa-ld$(EXESUF) \
73+ arm-tcc-vfp$(EXESUF) arm-tcc-vfp-eabi$(EXESUF)
74+C67_CROSS = c67-tcc$(EXESUF)
75+
76+CORE_FILES = tcc.c tccelf.c tccasm.c tcctok.h libtcc.h config.h
77+I386_FILES = $(CORE_FILES) i386-gen.c i386-asm.c i386-asm.h
78+WIN32_FILES = $(CORE_FILES) i386-gen.c i386-asm.c i386-asm.h tccpe.c
79+X86_64_FILES = $(CORE_FILES) x86_64-gen.c
80+ARM_FILES = $(CORE_FILES) arm-gen.c
81+C67_FILES = $(CORE_FILES) c67-gen.c tcccoff.c
5282
5383 ifdef CONFIG_WIN32
5484 PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF)
85+NATIVE_FILES=$(WIN32_FILES)
5586 PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(C67_CROSS)
56−
57−else ifeq ($(ARCH),i386)
87+else
88+ifeq ($(ARCH),i386)
89+NATIVE_FILES=$(I386_FILES)
5890 PROGS_CROSS=$(X64_CROSS) $(WIN32_CROSS) $(ARM_CROSS) $(C67_CROSS)
59−
60−else ifeq ($(ARCH),arm)
61−PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(C67_CROSS)
62−
63−else ifeq ($(ARCH),x86-64)
91+else
92+ifeq ($(ARCH),x86-64)
93+NATIVE_FILES=$(X86_64_FILES)
6494 PROGS_CROSS=$(I386_CROSS) $(WIN32_CROSS) $(ARM_CROSS) $(C67_CROSS)
95+else
96+ifeq ($(ARCH),arm)
97+NATIVE_FILES=$(ARM_FILES)
98+PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(C67_CROSS)
99+endif
100+endif
101+endif
65102 endif
66103
67104 ifdef CONFIG_CROSS
68105 PROGS+=$(PROGS_CROSS)
69106 endif
70107
71−ifndef CONFIG_USE_LIBGCC
72−LIBTCC1=libtcc1.a
73−endif
74−
75108 all: $(PROGS) $(LIBTCC1) $(BCHECK_O) libtcc.a tcc-doc.html tcc.1 libtcc_test$(EXESUF)
76109
77−TCC_CORE_FILES = tcc.c tccelf.c tccasm.c tcctok.h libtcc.h config.h
78−
79110 # Host Tiny C Compiler
80−ifdef CONFIG_WIN32
81−tcc$(EXESUF): $(TCC_CORE_FILES) i386-gen.c i386-asm.c i386-asm.h tccpe.c
82− $(CC) -o $@ $< -DTCC_TARGET_PE $(CFLAGS) $(LIBS)
83−
84−else ifeq ($(ARCH),i386)
85−tcc$(EXESUF): $(TCC_CORE_FILES) i386-gen.c i386-asm.c i386-asm.h
86− $(CC) -o $@ $< $(CFLAGS) $(LIBS)
87−
88−else ifeq ($(ARCH),x86-64)
89−tcc$(EXESUF): $(TCC_CORE_FILES) x86_64-gen.c
90− $(CC) -o $@ $< -DTCC_TARGET_X86_64 $(CFLAGS) $(LIBS)
91−
92−else ifeq ($(ARCH),arm)
93−ARMFLAGS = $(if $(wildcard /lib/ld-linux.so.3),-DTCC_ARM_EABI)
94−ARMFLAGS += $(if $(shell grep -l "^Features.* \(vfp\|iwmmxt\) " /proc/cpuinfo),-DTCC_ARM_VFP)
95−tcc$(EXESUF): $(TCC_CORE_FILES) arm-gen.c
96− $(CC) -o $@ $< -DTCC_TARGET_ARM $(ARMFLAGS) $(CFLAGS) $(LIBS)
97−endif
111+tcc$(EXESUF): $(NATIVE_FILES)
112+ $(CC) -o $@ $< $(NATIVE_TARGET) $(CFLAGS) $(LIBS)
98113
99114 # Cross Tiny C Compilers
100−i386-tcc$(EXESUF): $(TCC_CORE_FILES) i386-gen.c i386-asm.c i386-asm.h
101− $(CC) -o $@ $< $(CFLAGS) $(LIBS)
115+i386-tcc$(EXESUF): $(I386_FILES)
116+ $(CC) -o $@ $< -DTCC_TARGET_I386 $(CFLAGS) $(LIBS)
102117
103−i386-win32-tcc$(EXESUF): $(TCC_CORE_FILES) i386-gen.c i386-asm.c i386-asm.h tccpe.c
118+i386-win32-tcc$(EXESUF): $(WIN32_FILES)
104119 $(CC) -o $@ $< -DTCC_TARGET_PE $(CFLAGS) $(LIBS)
105120
106−x86_64-tcc$(EXESUF): $(TCC_CORE_FILES) x86_64-gen.c i386-asm.c i386-asm.h
121+x86_64-tcc$(EXESUF): $(X86_64_FILES)
107122 $(CC) -o $@ $< -DTCC_TARGET_X86_64 $(CFLAGS) $(LIBS)
108123
109−c67-tcc$(EXESUF): $(TCC_CORE_FILES) c67-gen.c tcccoff.c
124+c67-tcc$(EXESUF): $(C67_FILES)
110125 $(CC) -o $@ $< -DTCC_TARGET_C67 $(CFLAGS) $(LIBS)
111126
112−arm-tcc-fpa$(EXESUF): $(TCC_CORE_FILES) arm-gen.c
127+arm-tcc-fpa$(EXESUF): $(ARM_FILES)
113128 $(CC) -o $@ $< -DTCC_TARGET_ARM $(CFLAGS) $(LIBS)
114129
115−arm-tcc-fpa-ld$(EXESUF): $(TCC_CORE_FILES) arm-gen.c
130+arm-tcc-fpa-ld$(EXESUF): $(ARM_FILES)
116131 $(CC) -o $@ $< -DTCC_TARGET_ARM -DLDOUBLE_SIZE=12 $(CFLAGS) $(LIBS)
117132
118−arm-tcc-vfp$(EXESUF): $(TCC_CORE_FILES) arm-gen.c
133+arm-tcc-vfp$(EXESUF): $(ARM_FILES)
119134 $(CC) -o $@ $< -DTCC_TARGET_ARM -DTCC_ARM_VFP $(CFLAGS) $(LIBS)
120135
121−arm-tcc-vfp-eabi$(EXESUF): $(TCC_CORE_FILES) arm-gen.c
136+arm-tcc-vfp-eabi$(EXESUF): $(ARM_FILES)
122137 $(CC) -o $@ $< -DTCC_TARGET_ARM -DTCC_ARM_EABI $(CFLAGS) $(LIBS)
123138
124139 # libtcc generation and test
125−libtcc.o: tcc.c i386-gen.c
126−ifdef CONFIG_WIN32
127− $(CC) -o $@ -c $< -DTCC_TARGET_PE -DLIBTCC $(CFLAGS)
128−else
129− $(CC) -o $@ -c $< $(TARGET) -DLIBTCC $(CFLAGS)
130−endif
140+libtcc.o: $(NATIVE_FILES)
141+ $(CC) -o $@ -c $< $(NATIVE_TARGET) -DLIBTCC $(CFLAGS)
131142
132143 libtcc.a: libtcc.o
133144 $(AR) rcs $@ $^
@@ -139,8 +150,8 @@ libtest: libtcc_test$(EXESUF) $(LIBTCC1) · 5 unmodified lines
139150 ./libtcc_test$(EXESUF) lib_path=.
140151
141152 # profiling version
142−tcc_p: tcc.c
143− $(CC) -o $@ $< $(CFLAGS_P) $(LIBS_P)
153+tcc_p$(EXESUF): $(NATIVE_FILES)
154+ $(CC) -o $@ $< $(NATIVE_TARGET) $(CFLAGS_P) $(LIBS_P)
144155
145156 # windows utilities
146157 tiny_impdef$(EXESUF): win32/tools/tiny_impdef.c
@@ -163,7 +174,7 @@ LIBTCC1_OBJS+=alloca86.o alloca86-bt.o · 16 unmodified lines
163174 endif
164175
165176 %.o: %.c
166− $(LIBTCC1_CC) -o $@ -c $< -O2 -Wall
177+ $(LIBTCC1_CC) -o $@ -c $< -O2 -Wall
167178
168179 %.o: %.S
169180 $(LIBTCC1_CC) -o $@ -c $<
@@ -220,7 +231,7 @@ install: $(PROGS) $(LIBTCC1) libtcc.a tcc-doc.html · 50 unmodified lines
220231 cp -r win32/include/. "$(tccdir)/include"
221232 cp -r win32/examples/. "$(tccdir)/examples"
222233 $(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"
224235 $(INSTALL) -m644 libtcc.a libtcc.h "$(tccdir)/libtcc"
225236 endif
226237
@@ -247,10 +258,9 @@ test clean : · 20 unmodified lines
247258 # clean
248259 clean: local_clean
249260 local_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)
251262
252263 distclean: clean
253264 rm -vf config.h config.mak config.texi tcc.1 tcc-doc.html
254265
255−endif
256−# ifeq ($(TOP),.)
266+endif # ifeq ($(TOP),.)
tests/Makefile+2−2
@@ -17,7 +17,7 @@ include $(TOP)/Makefile · 16 unmodified lines
1717
1818 # run local version of tcc with local libraries and includes
1919 TCC = ../tcc -B..
20−RUN_TCC = $(TARGET) -run ../tcc.c -B..
20+RUN_TCC = $(NATIVE_TARGET) -run ../tcc.c -B..
2121 DISAS=objdump -d
2222
2323 all test : $(TESTS)
@@ -141,4 +141,4 @@ cache: tcc_g · 117 unmodified lines
141141 # clean
142142 clean:
143143 rm -vf *~ *.o *.a *.bin *.i *.ref *.out *.out? *.gcc \
144− tcctest[1234] ex? libtcc_test tcc_g
144+ 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