[BusyBox-cvs] busybox .cvsignore,1.10,1.11 Makefile,1.266,1.267 Rules.mak,1.8,1.9

Erik Andersen andersen at codepoet.org
Thu Dec 5 08:42:05 UTC 2002


Update of /var/cvs/busybox
In directory winder:/tmp/cvs-serv7481

Modified Files:
	.cvsignore Makefile Rules.mak 
Log Message:
Yet another major rework of the BusyBox config system, using the considerably
modified Kbuild system I put into uClibc.  With this, there should be no more
need to modify Rules.mak since I've moved all the interesting options into the
config system.  I think I've got everything updated, but you never know, I may
have made some mistakes, so watch closely.
 -Erik


Index: .cvsignore
===================================================================
RCS file: /var/cvs/busybox/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- .cvsignore	24 Oct 2001 20:01:04 -0000	1.10
+++ .cvsignore	5 Dec 2002 08:40:31 -0000	1.11
@@ -3,3 +3,5 @@
 _install
 .config
 .menuconfig.log
+.config.cmd
+.config.old

Index: Makefile
===================================================================
RCS file: /var/cvs/busybox/Makefile,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- Makefile	11 Nov 2002 03:00:03 -0000	1.266
+++ Makefile	5 Dec 2002 08:40:31 -0000	1.267
@@ -17,34 +17,27 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-TOPDIR:= $(shell /bin/pwd)/
-include $(TOPDIR).config
-include $(TOPDIR)Rules.mak
-SUBDIRS:=applets archival archival/libunarchive console-tools debianutils \
+#--------------------------------------------------------------
+# You shouldn't need to mess with anything beyond this point...
+#--------------------------------------------------------------
+noconfig_targets := menuconfig config oldconfig randconfig \
[...197 lines suppressed...]
@@ -247,13 +235,14 @@
 						\
 	tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION)/;
 
+tags:
+	ctags -R .
 
 
-.PHONY: tags check depend
+endif # ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
+endif # ifdef include_config
 
-tags:
-	ctags -R .
+.PHONY: dummy subdirs release distclean clean config oldconfig \
+	menuconfig tags check test tests depend
 
-check: busybox
-	cd testsuite && ./runtest
 

Index: Rules.mak
===================================================================
RCS file: /var/cvs/busybox/Rules.mak,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Rules.mak	30 Oct 2002 06:55:37 -0000	1.8
+++ Rules.mak	5 Dec 2002 08:40:31 -0000	1.9
@@ -17,68 +17,25 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
+#--------------------------------------------------------
 PROG      := busybox
 VERSION   := 0.61.pre
 BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
-HOSTCC    := gcc
-HOSTCFLAGS:= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
-
 
[...155 lines suppressed...]
     LDFLAGS +=-Wl,-warn-common
     STRIPCMD:=/bin/true -Not_stripping_since_we_are_debugging
@@ -185,7 +163,7 @@
     LDFLAGS += -s -Wl,-warn-common
     STRIPCMD:=$(STRIP) --remove-section=.note --remove-section=.comment
 endif
-ifeq ($(strip $(DOSTATIC)),true)
+ifeq ($(strip $(DOSTATIC)),y)
     LDFLAGS += --static
 endif
 
@@ -203,8 +181,6 @@
     VPATH:=$(BB_SRC_DIR)
 endif
 
-CFLAGS    += -DBB_VER='"$(VERSION)"'
-CFLAGS    += -DBB_BT='"$(BUILDTIME)"'
 OBJECTS:=$(APPLET_SOURCES:.c=.o) busybox.o usage.o applets.o
 CFLAGS    += $(CROSS_CFLAGS)
 ifdef BB_INIT_SCRIPT




More information about the busybox-cvs mailing list