X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Rules.mak;h=d04d4b9f207ec8547d168a7e9bdb0d33ccb21311;hb=5c9ed9f41afc6531daee5904673cf889c339ed3d;hp=79f3b505317c8c2579a73ebd4ed4fa40490cfaf9;hpb=01bf3d0c92a936c697bd079d918e131d56c59cf4;p=oweals%2Fbusybox.git

diff --git a/Rules.mak b/Rules.mak
index 79f3b5053..d04d4b9f2 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -19,7 +19,7 @@
 
 #--------------------------------------------------------
 PROG      := busybox
-VERSION   := 1.00-pre9
+VERSION   := 1.00
 BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
 
 
@@ -42,7 +42,7 @@ LD             = $(CROSS)ld
 NM             = $(CROSS)nm
 STRIP          = $(CROSS)strip
 CPP            = $(CC) -E
-MAKEFILES      = $(TOPDIR).config
+# MAKEFILES      = $(top_builddir)/.config
 
 # What OS are you compiling busybox for?  This allows you to include
 # OS specific things, syscall overrides, etc.
@@ -80,7 +80,7 @@ BB_SRC_DIR=
 #GCCINCDIR:=$(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
 
 WARNINGS=-Wall -Wstrict-prototypes -Wshadow
-CFLAGS=-I$(TOPDIR)include
+CFLAGS=-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)
 ARFLAGS=-r
 
 #--------------------------------------------------------
@@ -102,7 +102,7 @@ endif
 
 # Pull in the user's busybox configuration
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
--include $(TOPDIR).config
+-include $(top_builddir)/.config
 endif
 
 # A nifty macro to make testing gcc features easier
@@ -189,12 +189,8 @@ endif
 # have a chance of winning.
 CFLAGS += $(CFLAGS_EXTRA)
 
-%.o: %.c
-	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-
 .PHONY: dummy
 
 
-
 .EXPORT_ALL_VARIABLES: