ramips: use definitions from rt305x_regs, and nuke the duplicated ones

[openwrt.git] / scripts / config / Makefile

diff --git a/scripts/config/Makefile b/scripts/config/Makefile
index 6cdab2e..54c5fe2 100644 (file)
--- a/scripts/config/Makefile
+++ b/scripts/config/Makefile
@@ -13,10 +13,7 @@
 # Platform specific fixes
 #
 # FreeBSD
 # Platform specific fixes
 #
 # FreeBSD

-ifeq ($(shell uname -s),FreeBSD)
-export CFLAGS+=-I/usr/local/include
-export LDFLAGS+=-L/usr/local/lib -lintl
-endif
+export CFLAGS+=-DKBUILD_NO_NLS

 
 conf-objs      := conf.o zconf.tab.o
 mconf-objs     := mconf.o zconf.tab.o
 
 conf-objs      := conf.o zconf.tab.o
 mconf-objs     := mconf.o zconf.tab.o


@@ -24,20 +21,19 @@ mconf-objs  := mconf.o zconf.tab.o
 clean-files    := lkc_defs.h qconf.moc .tmp_qtcheck \
                   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c
 
 clean-files    := lkc_defs.h qconf.moc .tmp_qtcheck \
                   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c
 

-all: conf mconf lxdialog
+all: conf mconf lxdialog/lxdialog

 
 

-.PHONY: lxdialog
-lxdialog:
+lxdialog/lxdialog:

        $(MAKE) -C lxdialog
 
 conf: $(conf-objs)
        $(MAKE) -C lxdialog
 
 conf: $(conf-objs)

-mconf: $(mconf-objs)
+mconf: $(mconf-objs) 

 
 clean:
        rm -f *.o $(clean-files) conf mconf
        $(MAKE) -C lxdialog clean
 
 
 clean:
        rm -f *.o $(clean-files) conf mconf
        $(MAKE) -C lxdialog clean
 

-zconf.tab.o: lex.zconf.c zconf.hash.c
+zconf.tab.o: lex.zconf.c zconf.hash.c confdata.c

 
 kconfig_load.o: lkc_defs.h
 
 
 kconfig_load.o: lkc_defs.h