Resync uml with generic-2.6 kernel config

[openwrt.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index a593468..0ce75f5 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -42,7 +42,7 @@ endif
 
 IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH)
 
 
 IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH)
 

-TARGET_PATH:=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:$(PATH)
+TARGET_PATH:=$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:$(PATH)

 TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)
 
 export PATH:=$(TARGET_PATH)
 TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)
 
 export PATH:=$(TARGET_PATH)


@@ -61,6 +61,7 @@ CP:=cp -fpR
 INSTALL_BIN:=install -m0755
 INSTALL_DIR:=install -d -m0755
 INSTALL_DATA:=install -m0644
 INSTALL_BIN:=install -m0755
 INSTALL_DIR:=install -d -m0755
 INSTALL_DATA:=install -m0644

+INSTALL_CONF:=install -m0600

 
 ifneq ($(CONFIG_CCACHE),)
   # FIXME: move this variable to a better location
 
 ifneq ($(CONFIG_CCACHE),)
   # FIXME: move this variable to a better location


@@ -68,6 +69,10 @@ ifneq ($(CONFIG_CCACHE),)
   TARGET_CC:= ccache $(TARGET_CC)
 endif
 
   TARGET_CC:= ccache $(TARGET_CC)
 endif
 

+EXTRA_CPPFLAGS := -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+EXTRA_CFLAGS := $(EXTRA_CPPFLAGS)
+EXTRA_LDFLAGS := -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
+

 TARGET_CONFIGURE_OPTS:= \
   AR=$(TARGET_CROSS)ar \
   AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \
 TARGET_CONFIGURE_OPTS:= \
   AR=$(TARGET_CROSS)ar \
   AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \


@@ -77,10 +82,13 @@ TARGET_CONFIGURE_OPTS:= \
   GCC="$(TARGET_CC)" \
   CXX=$(TARGET_CROSS)g++ \
   RANLIB=$(TARGET_CROSS)ranlib \
   GCC="$(TARGET_CC)" \
   CXX=$(TARGET_CROSS)g++ \
   RANLIB=$(TARGET_CROSS)ranlib \

-  STRIP=$(TARGET_CROSS)strip
+  STRIP=$(TARGET_CROSS)strip \
+  OBJCOPY=$(TARGET_CROSS)objcopy \
+       OBJDUMP=$(TARGET_CROSS)objdump

 
 # strip an entire directory
 RSTRIP:= \
 
 # strip an entire directory
 RSTRIP:= \

+  NM="$(TARGET_CROSS)nm" \

   STRIP="$(STRIP)" \
   STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" \
   $(SCRIPT_DIR)/rstrip.sh
   STRIP="$(STRIP)" \
   STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" \
   $(SCRIPT_DIR)/rstrip.sh


@@ -123,7 +131,6 @@ $(call shvar,$(1))=$$(call $(1))
 export $(call shvar,$(1))
 endef
 
 export $(call shvar,$(1))
 endef
 

-

 all:
 FORCE: ;
 .PHONY: FORCE
 all:
 FORCE: ;
 .PHONY: FORCE