aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-09-21 02:04:51 +0000
committerEric Andersen <andersen@codepoet.org>2000-09-21 02:04:51 +0000
commit624cc771da4ac5f15ec16a2b0f10feeef0b125c7 (patch)
tree159ab99cb2f1e14218204306c1be24f0b6c85745 /Makefile
parent8847b9a03afd59a4d4f833be12937b38216799d3 (diff)
downloadbusybox-w32-624cc771da4ac5f15ec16a2b0f10feeef0b125c7.tar.gz
busybox-w32-624cc771da4ac5f15ec16a2b0f10feeef0b125c7.tar.bz2
busybox-w32-624cc771da4ac5f15ec16a2b0f10feeef0b125c7.zip
More portable handling of loop header files, as done in util-linux
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile21
1 files changed, 14 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index a2940b5cc..278887f36 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ DODMALLOC = false
42 42
43# If you are running a cross compiler, you may want to set this 43# If you are running a cross compiler, you may want to set this
44# to something more interesting... 44# to something more interesting...
45CROSS = 45CROSS = #powerpc-linux-
46CC = $(CROSS)gcc 46CC = $(CROSS)gcc
47STRIPTOOL = $(CROSS)strip 47STRIPTOOL = $(CROSS)strip
48 48
@@ -83,12 +83,13 @@ else
83 ifeq ($(DOSTATIC),true) 83 ifeq ($(DOSTATIC),true)
84 LDFLAGS += --static 84 LDFLAGS += --static
85 # 85 #
86 #use '-ffunction-sections -fdata-sections' and '--gc-sections' if they work 86 #use '-ffunction-sections -fdata-sections' and '--gc-sections' (if they
87 #to try and strip out any unused junk. Doesn't do much for me, but you may 87 # work) to try and strip out any unused junk. Doesn't do much for me,
88 #want to give it a shot... 88 # but you may want to give it a shot...
89 # 89 #
90 #ifeq ($(shell $(CC) -ffunction-sections -fdata-sections -S \ 90 #ifeq ($(shell $(CC) -ffunction-sections -fdata-sections -S \
91 # -o /dev/null -xc /dev/null 2>/dev/null && $(LD) --gc-sections -v >/dev/null && echo 1),1) 91 # -o /dev/null -xc /dev/null 2>/dev/null && $(LD) \
92 # --gc-sections -v >/dev/null && echo 1),1)
92 # CFLAGS += -ffunction-sections -fdata-sections 93 # CFLAGS += -ffunction-sections -fdata-sections
93 # LDFLAGS += --gc-sections 94 # LDFLAGS += --gc-sections
94 #endif 95 #endif
@@ -106,7 +107,8 @@ ifdef BB_INIT_SCRIPT
106 CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"' 107 CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"'
107endif 108endif
108 109
109all: busybox busybox.links doc 110
111all: loop.h busybox busybox.links doc
110 112
111doc: olddoc 113doc: olddoc
112 114
@@ -154,7 +156,7 @@ docs/busybox/busybox.html: docs/busybox.sgml
154 156
155 157
156 158
157busybox: $(OBJECTS) 159busybox: $(OBJECTS)
158 $(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES) 160 $(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
159 $(STRIP) 161 $(STRIP)
160 162
@@ -164,6 +166,11 @@ busybox.links: busybox.def.h
164nfsmount.o cmdedit.o: %.o: %.h 166nfsmount.o cmdedit.o: %.o: %.h
165$(OBJECTS): %.o: busybox.def.h internal.h %.c Makefile 167$(OBJECTS): %.o: busybox.def.h internal.h %.c Makefile
166 168
169utility.o:
170
171loop.h:
172 @./mk_loop_h.sh
173
167test tests: 174test tests:
168 cd tests && $(MAKE) all 175 cd tests && $(MAKE) all
169 176