Change some variable names so we are more consistant with what

the linux kernel uses.
 -Erik

9 files changed, 32 insertions, 34 deletions

diff --git a/Makefile b/Makefile
index 7c8acadb8..e34b39f27 100644
--- a/Makefile
+++ b/Makefile
@@ -306,7 +306,6 @@ extra/config/conf extra/config/mconf:
 	fi
 
 menuconfig: extra/config/mconf
-	make -C extra/config/lxdialog
 	rm -rf include/bits
 	mkdir -p include/bits
 	@./extra/config/mconf extra/Configs/Config.$(TARGET_ARCH)
diff --git a/Rules.mak b/Rules.mak
index d212230c9..abe7696f2 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -42,8 +42,8 @@ NM= $(CROSS)nm
 STRIPTOOL= $(CROSS)strip
 
 # Select the compiler needed to build binaries for your development system
-NATIVE_CC=gcc
-NATIVE_CFLAGS=-O2 -Wall
+HOSTCC=gcc
+HOSTCFLAGS=-O2 -Wall
 
 
 #--------------------------------------------------------
@@ -78,7 +78,7 @@ check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1;
 AWK:=$(shell if [ -x /usr/bin/nawk ]; then echo "/usr/bin/nawk"; \
 	else echo "/usr/bin/awk"; fi)
 
-NATIVE_ARCH:= $(shell uname -m | sed \
+HOST_ARCH:= $(shell uname -m | sed \
 		-e 's/i.86/i386/' \
 		-e 's/sparc.*/sparc/' \
 		-e 's/arm.*/arm/g' \
diff --git a/extra/config/Makefile b/extra/config/Makefile
index e2fc8c5a7..50d9ac096 100644
--- a/extra/config/Makefile
+++ b/extra/config/Makefile
@@ -22,18 +22,17 @@ include $(TOPDIR)Rules.mak
 
 all: ncurses conf mconf
 
-#NATIVE_CFLAGS=-Wall -g -O0
 LIBS = -lncurses
 ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
-	NATIVE_CFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
+	HOSTCFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
 else
 ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h))
-	NATIVE_CFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
+	HOSTCFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
 else
 ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h))
-	NATIVE_CFLAGS += -DCURSES_LOC="<ncurses.h>"
+	HOSTCFLAGS += -DCURSES_LOC="<ncurses.h>"
 else
-	NATIVE_CFLAGS += -DCURSES_LOC="<curses.h>"
+	HOSTCFLAGS += -DCURSES_LOC="<curses.h>"
 endif
 endif
 endif
@@ -47,10 +46,10 @@ MCONF_OBJS=$(patsubst %.c,%.o, $(MCONF_SRC))
 LXDLG_OBJS=$(patsubst %.c,%.o, $(LXDLG_SRC))
 
 conf: $(CONF_OBJS) 
-	$(NATIVE_CC) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) $^ -o $@
+	$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@
 
 mconf: $(MCONF_OBJS) $(LXDLG_OBJS)
-	$(NATIVE_CC) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
+	$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
 
 lkc_deps:=lkc.h lkc_proto.h lkc_defs.h expr.h zconf.tab.h
 
@@ -63,7 +62,7 @@ zconf.tab.o: zconf.tab.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(lkc_dep
 lex.zconf.o: lex.zconf.c $(lkc_deps)
 
 %.o : %.c
-	$(NATIVE_CC) $(NATIVE_CFLAGS) -I. -c $< -o $@
+	$(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@
 
 lkc_defs.h: lkc_proto.h
 	@sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
@@ -97,7 +96,7 @@ endif
 
 ncurses:
 	@echo "main() {}" > lxtemp.c
-	@if $(NATIVE_CC) lxtemp.c $(LIBS) ; then \
+	@if $(HOSTCC) lxtemp.c $(LIBS) ; then \
 		rm -f lxtemp.c a.out; \
 	else \
 		rm -f lxtemp.c; \
diff --git a/extra/gcc-uClibc/Makefile b/extra/gcc-uClibc/Makefile
index 1c64f856a..523b10113 100644
--- a/extra/gcc-uClibc/Makefile
+++ b/extra/gcc-uClibc/Makefile
@@ -41,7 +41,7 @@ else
 endif
 
 gcc-uClibc: gcc-uClibc.h gcc-uClibc.c
-	$(NATIVE_CC) $(NATIVE_CFLAGS) -Wl,-s gcc-uClibc.c -o $(TARGET_ARCH)-uclibc-gcc
+	$(HOSTCC) $(HOSTCFLAGS) -Wl,-s gcc-uClibc.c -o $(TARGET_ARCH)-uclibc-gcc
 
 ld-uClibc:
 	@echo "#!/bin/sh" > $(TARGET_ARCH)-uclibc-ld
diff --git a/extra/locale/Makefile b/extra/locale/Makefile
index 3f6e7476e..deb60efb2 100644
--- a/extra/locale/Makefile
+++ b/extra/locale/Makefile
@@ -26,14 +26,14 @@ codesets.txt:
 	fi;
 
 gen_wc8bit: gen_wc8bit.c
-	$(NATIVE_CC) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) $(CFLAGS_wc8bit) $^ -o $@
+	$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $(CFLAGS_wc8bit) $^ -o $@
 #gen_wc8bit.c -o gen_wc8bit
 
 c8tables.h: gen_wc8bit codesets.txt
 	./gen_wc8bit `cat codesets.txt`
 
 gen_wctype: gen_wctype.c
-	$(NATIVE_CC) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) $^ -o $@
+	$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@
 #gen_wctype.c -o gen_wctype
 
 # Warning! Beware tr_TR toupper/tolower exceptions!
@@ -42,7 +42,7 @@ wctables.h: gen_wctype
 	./gen_wctype en_US
 
 gen_locale: gen_locale.c c8tables.h
-	$(NATIVE_CC) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) gen_locale.c -o $@
+	$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) gen_locale.c -o $@
 #gen_locale.c -o gen_locale
 
 # TODO: if no wide char support, we should auto-disable all UTF-8 locales
@@ -67,7 +67,7 @@ locales.txt:
 	    false; \
 	fi;
 
-# ifneq ($(TARGET_ARCH),$(NATIVE_ARCH))
+# ifneq ($(TARGET_ARCH),$(HOST_ARCH))
 
 # locale.mmap: gen_mmap
 # 	echo Your locale.mmap file is either missing or out of date.
@@ -90,7 +90,7 @@ locales.txt:
 # 	./lmmtolso
 
 gen_ldc: gen_ldc.c c8tables.h wctables.h locale_tables.h
-	$(NATIVE_CC) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) $(CFLAGS_mmap) gen_ldc.c -o $@
+	$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $(CFLAGS_mmap) gen_ldc.c -o $@
 #gen_ldc.c -o gen_ldc
 
 locale_data.c: gen_ldc
diff --git a/ldso/util/Makefile b/ldso/util/Makefile
index 35c2dceab..0f36bd31e 100644
--- a/ldso/util/Makefile
+++ b/ldso/util/Makefile
@@ -37,7 +37,7 @@ elf_header:
 	ln -fs $(TOPDIR)include/elf.h
 
 readelf: readelf.c
-	$(NATIVE_CC) $(NATIVE_CFLAGS) -I . readelf.c -o $@
+	$(HOSTCC) $(HOSTCFLAGS) -I . readelf.c -o $@
 	strip -x -R .note -R .comment $@
 
 readelf.target: readelf.c
@@ -45,20 +45,20 @@ readelf.target: readelf.c
 	$(STRIPTOOL) -x -R .note -R .comment $@
 
 readsoname.o: readsoname.c readsoname2.c
-	$(NATIVE_CC) $(NATIVE_CFLAGS) -I . -c $< -o $@
+	$(HOSTCC) $(HOSTCFLAGS) -I . -c $< -o $@
 	strip -x -R .note -R .comment $*.o
     
 ldconfig.o: ldconfig.c
-	$(NATIVE_CC) $(NATIVE_CFLAGS) -I . \
+	$(HOSTCC) $(HOSTCFLAGS) -I . \
 		-DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" -c $< -o $@
 	strip -x -R .note -R .comment $*.o
 
 ldconfig: ldconfig.o readsoname.o
-	$(NATIVE_CC) $(NATIVE_CFLAGS) $^ -o $@
+	$(HOSTCC) $(HOSTCFLAGS) $^ -o $@
 	strip -x -R .note -R .comment $@
 
 ldd: ldd.c
-	$(NATIVE_CC) $(NATIVE_CFLAGS) -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \
+	$(HOSTCC) $(HOSTCFLAGS) -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \
 		-DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \
 		-DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \
 		-DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" -I . \
diff --git a/libc/unistd/Makefile b/libc/unistd/Makefile
index 0d05e6d49..92f27e1a6 100644
--- a/libc/unistd/Makefile
+++ b/libc/unistd/Makefile
@@ -34,7 +34,7 @@ ifeq ($(strip $(UCLIBC_HAS_MMU)),y)
 endif
 
 # TESTING -- comment this out if it breaks for you
-ifeq ($(TARGET_ARCH), $(NATIVE_ARCH))
+ifeq ($(TARGET_ARCH), $(HOST_ARCH))
 	SYSCONF = sysconf_native
 else
 	SYSCONF = sysconf_$(TARGET_ARCH).c
@@ -52,8 +52,8 @@ ar-target: $(OBJS)
 
 # We are cross-compiling so use the generic sysconf.c.
 sysconf_$(TARGET_ARCH).c: sysconf.c
-	@echo warning: sysconf_$(NATIVE_ARCH).c is older then sysconf.c so using generic sysconf.c
-	@echo To build sysconf_$(NATIVE_ARCH).c run gen_sysconf \> sysconf_$(NATIVE_ARCH).c on
+	@echo warning: sysconf_$(HOST_ARCH).c is older then sysconf.c so using generic sysconf.c
+	@echo To build sysconf_$(HOST_ARCH).c run gen_sysconf \> sysconf_$(HOST_ARCH).c on
 	@echo your target platform, place in the unistd directory, and rebuild
 	cp -f sysconf.c sysconf_$(TARGET_ARCH).c
 
@@ -74,14 +74,14 @@ gen_sysconf_tester.o: sysconf_tester.o getpagesize_tester.o
 		cp -f sysconf.c sysconf_src.c ;\
 	else \
 		set -e -x; \
-		if ../extra/gcc-uClibc/gcc-uClibc-$(NATIVE_ARCH) -static \
+		if ../extra/gcc-uClibc/gcc-uClibc-$(HOST_ARCH) -static \
 			-D_UCLIBC_GENERATE_SYSCONF_MAIN sysconf.c sysconf_tester.o \
-			-o gen_sysconf && ./gen_sysconf > sysconf_$(NATIVE_ARCH).c ;\
+			-o gen_sysconf && ./gen_sysconf > sysconf_$(HOST_ARCH).c ;\
 		then \
-			echo successfully built sysconf_$(NATIVE_ARCH).c ;\
+			echo successfully built sysconf_$(HOST_ARCH).c ;\
 		else \
 			echo warning: build of gen_sysconf failed so using generic sysconf.c ;\
-			cp -f sysconf.c sysconf_$(NATIVE_ARCH).c ;\
+			cp -f sysconf.c sysconf_$(HOST_ARCH).c ;\
 		fi ;\
 	fi
 
diff --git a/test/Makefile b/test/Makefile
index f07d87d74..39bd21d18 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -24,7 +24,7 @@ TOPDIR=../
 
 ALL_SUBDIRS = args assert ctype ldso pwd_grp signal silly stdlib string unistd crypt #misc
 DIRS = $(ALL_SUBDIRS)
-#ifeq ($(TARGET_ARCH), $(NATIVE_ARCH))
+#ifeq ($(TARGET_ARCH), $(HOST_ARCH))
 #	DIRS = $(ALL_SUBDIRS)
 #else
 #	DIRS =
diff --git a/test/Rules.mak b/test/Rules.mak
index c90f9744e..6090fd700 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -10,9 +10,9 @@
 include $(TESTDIR)Config
 
 
-# Use NATIVE_ARCH here since running these test is not
+# Use HOST_ARCH here since running these test is not
 # even possible when cross compiling...
-NATIVE_ARCH:= $(shell uname -m | sed \
+HOST_ARCH:= $(shell uname -m | sed \
 		-e 's/i.86/i386/' \
 		-e 's/sparc.*/sparc/' \
 		-e 's/arm.*/arm/g' \