aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-05-02 05:31:00 +0000
committererik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-05-02 05:31:00 +0000
commit0e918615cb9a96a9f2df56f30361ec60261ecfdb (patch)
tree47620a32116ea3c8b2426496201a472141608bfd
parenta11ca391a91b1bf925bebc4d5155864aa48001d1 (diff)
downloadbusybox-w32-0e918615cb9a96a9f2df56f30361ec60261ecfdb.tar.gz
busybox-w32-0e918615cb9a96a9f2df56f30361ec60261ecfdb.tar.bz2
busybox-w32-0e918615cb9a96a9f2df56f30361ec60261ecfdb.zip
Make the dependancies on the docs work properly
-Erik git-svn-id: svn://busybox.net/trunk/busybox@516 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--Makefile11
1 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index bf42e585c..fc0396eec 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,8 @@ ifndef $(STRIPTOOL)
68 STRIPTOOL = strip 68 STRIPTOOL = strip
69endif 69endif
70 70
71# TODO: Try compiling vs other libcs. See what -nostdinc and -nostdlib do for that. 71# TODO: Try compiling vs other libcs.
72# See what -nostdinc and -nostdlib do for them.
72# also try --prefix=/usr/my-libc-stuff 73# also try --prefix=/usr/my-libc-stuff
73 74
74# -D_GNU_SOURCE is needed because environ is used in init.c 75# -D_GNU_SOURCE is needed because environ is used in init.c
@@ -98,14 +99,12 @@ ifdef BB_INIT_SCRIPT
98 CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"' 99 CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"'
99endif 100endif
100 101
101all: busybox busybox.links docs 102all: busybox busybox.links
102 103
103busybox: $(OBJECTS) 104busybox: $(OBJECTS)
104 $(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES) 105 $(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
105 $(STRIP) 106 $(STRIP)
106 107 ( cd docs ; $(MAKE) )
107docs:
108 $(MAKE) -C docs
109 108
110busybox.links: busybox.def.h 109busybox.links: busybox.def.h
111 - ./busybox.mkll | sort >$@ 110 - ./busybox.mkll | sort >$@
@@ -129,7 +128,7 @@ install: busybox busybox.links
129 ./install.sh $(PREFIX) 128 ./install.sh $(PREFIX)
130 129
131dist release: distclean 130dist release: distclean
132 $(MAKE) -C docs 131 ( cd docs ; $(MAKE) )
133 cd ..; \ 132 cd ..; \
134 rm -rf busybox-$(VERSION); \ 133 rm -rf busybox-$(VERSION); \
135 cp -a busybox busybox-$(VERSION); \ 134 cp -a busybox busybox-$(VERSION); \