Commit e62ed84b authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'for-2010.11/kconfig-upgrade' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents 9bc12b85 40177240

Makefile

+49 −55
Original line number Diff line number Diff line
@@ -25,12 +25,11 @@ 
# absolute path

TOPDIR:=$(shell pwd)

CONFIG_CONFIG_IN=Config.in

CONFIG_DEFCONFIG=.defconfig

CONFIG=package/config

DATE:=$(shell date +%Y%m%d)



noconfig_targets:=menuconfig gconfig xconfig config oldconfig randconfig \

	defconfig allyesconfig allnoconfig release \

noconfig_targets:=menuconfig nconfig gconfig xconfig config oldconfig randconfig \

	defconfig %_defconfig savedefconfig allyesconfig allnoconfig silentoldconfig release \

	randpackageconfig allyespackageconfig allnopackageconfig \

	source-check help
@@ -323,17 +322,17 @@ TARGETS_ALL:=$(patsubst %,__real_tgt_%,$(TARGETS)) 
# all targets depend on the crosscompiler and it's prerequisites

$(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %



$(BR2_DEPENDS_DIR): $(CONFIG_DIR)/.config

#	rm -rf $@

#	mkdir -p $(@D)

#	cp -dpRf $(CONFIG)/buildroot-config $@



dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \

	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)



$(BASE_TARGETS): dirs



world: dependencies dirs $(BASE_TARGETS) $(TARGETS_ALL)

$(BUILD_DIR)/buildroot-config/auto.conf: $(CONFIG_DIR)/.config

	$(MAKE) $(EXTRAMAKEARGS) silentoldconfig



prepare: $(BUILD_DIR)/buildroot-config/auto.conf



world: prepare dependencies dirs $(BASE_TARGETS) $(TARGETS_ALL)





.PHONY: all world dirs clean distclean source \
@@ -468,99 +467,98 @@ export HOSTCFLAGS 


$(BUILD_DIR)/buildroot-config/%onf:

	mkdir -p $(@D)/lxdialog

	$(MAKE) CC="$(HOSTCC)" obj=$(@D) -C $(CONFIG) $(@F)

	-@if [ ! -f $(CONFIG_DIR)/.config ]; then \

		cp $(CONFIG_DEFCONFIG) $(CONFIG_DIR)/.config; \

	fi

	$(MAKE) CC="$(HOSTCC)" obj=$(@D) -C $(CONFIG) -f Makefile.br $(@F)



COMMON_CONFIG_ENV = \

	KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \

	KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \

	KCONFIG_TRISTATE=$(BUILD_DIR)/buildroot-config/tristate.config \

	BUILDROOT_CONFIG=$(CONFIG_DIR)/.config



xconfig: $(BUILD_DIR)/buildroot-config/qconf

	@mkdir -p $(BUILD_DIR)/buildroot-config

	@if ! KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \

		KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \

		BUILDROOT_CONFIG=$(CONFIG_DIR)/.config $< $(CONFIG_CONFIG_IN); then \

	@if ! $(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN); then \

		test -f $(CONFIG_DIR)/.config.cmd || rm -f $(CONFIG_DIR)/.config; \

	fi



gconfig: $(BUILD_DIR)/buildroot-config/gconf

	@mkdir -p $(BUILD_DIR)/buildroot-config

	@if ! KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \

		KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \

		srctree=$(TOPDIR) \

		BUILDROOT_CONFIG=$(CONFIG_DIR)/.config $< $(CONFIG_CONFIG_IN); then \

	@if ! $(COMMON_CONFIG_ENV) srctree=$(TOPDIR) \

		$< $(CONFIG_CONFIG_IN); then \

		test -f $(CONFIG_DIR)/.config.cmd || rm -f $(CONFIG_DIR)/.config; \

	fi



menuconfig: $(BUILD_DIR)/buildroot-config/mconf

	@mkdir -p $(BUILD_DIR)/buildroot-config

	@if ! KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \

		KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \

		BUILDROOT_CONFIG=$(CONFIG_DIR)/.config $< $(CONFIG_CONFIG_IN); then \

	@if ! $(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN); then \

		test -f $(CONFIG_DIR)/.config.cmd || rm -f $(CONFIG_DIR)/.config; \

	fi



nconfig: $(BUILD_DIR)/buildroot-config/nconf

	@mkdir -p $(BUILD_DIR)/buildroot-config

	@if ! $(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN); then \

		test -f $(CONFIG_DIR)/.config.cmd || rm -f $(CONFIG_DIR)/.config; \

	fi



config: $(BUILD_DIR)/buildroot-config/conf

	@mkdir -p $(BUILD_DIR)/buildroot-config

	@KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \

		KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \

		BUILDROOT_CONFIG=$(CONFIG_DIR)/.config $< $(CONFIG_CONFIG_IN)

	@$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN)



oldconfig: $(BUILD_DIR)/buildroot-config/conf

	mkdir -p $(BUILD_DIR)/buildroot-config

	@KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \

		KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \

		BUILDROOT_CONFIG=$(CONFIG_DIR)/.config $< -o $(CONFIG_CONFIG_IN)

	@$(COMMON_CONFIG_ENV) $< --oldconfig $(CONFIG_CONFIG_IN)



randconfig: $(BUILD_DIR)/buildroot-config/conf

	@mkdir -p $(BUILD_DIR)/buildroot-config

	@KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \

		KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \

		BUILDROOT_CONFIG=$(CONFIG_DIR)/.config $< -r $(CONFIG_CONFIG_IN)

	@$(COMMON_CONFIG_ENV) $< --randconfig $(CONFIG_CONFIG_IN)



allyesconfig: $(BUILD_DIR)/buildroot-config/conf

	cat $(CONFIG_DEFCONFIG) > $(CONFIG_DIR)/.config

	@mkdir -p $(BUILD_DIR)/buildroot-config

	@KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \

		KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \

		BUILDROOT_CONFIG=$(CONFIG_DIR)/.config $< -y $(CONFIG_CONFIG_IN)

	@$(COMMON_CONFIG_ENV) $< --allyesconfig $(CONFIG_CONFIG_IN)



allnoconfig: $(BUILD_DIR)/buildroot-config/conf

	@mkdir -p $(BUILD_DIR)/buildroot-config

	@KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \

		KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \

		BUILDROOT_CONFIG=$(CONFIG_DIR)/.config $< -n $(CONFIG_CONFIG_IN)

	@$(COMMON_CONFIG_ENV) $< --allnoconfig $(CONFIG_CONFIG_IN)



randpackageconfig: $(BUILD_DIR)/buildroot-config/conf

	@mkdir -p $(BUILD_DIR)/buildroot-config

	@grep -v BR2_PACKAGE_ $(CONFIG_DIR)/.config > $(CONFIG_DIR)/.config.nopkg

	@KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \

		KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \

	@$(COMMON_CONFIG_ENV) \

		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \

		BUILDROOT_CONFIG=$(CONFIG_DIR)/.config $< -r $(CONFIG_CONFIG_IN)

		$< --randconfig $(CONFIG_CONFIG_IN)

	@rm -f $(CONFIG_DIR)/.config.nopkg



allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf

	@mkdir -p $(BUILD_DIR)/buildroot-config

	@grep -v BR2_PACKAGE_ $(CONFIG_DIR)/.config > $(CONFIG_DIR)/.config.nopkg

	@KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \

		KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \

	@$(COMMON_CONFIG_ENV) \

		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \

		BUILDROOT_CONFIG=$(CONFIG_DIR)/.config $< -y $(CONFIG_CONFIG_IN)

		$< --allyesconfig $(CONFIG_CONFIG_IN)

	@rm -f $(CONFIG_DIR)/.config.nopkg



allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf

	@mkdir -p $(BUILD_DIR)/buildroot-config

	@grep -v BR2_PACKAGE_ $(CONFIG_DIR)/.config > $(CONFIG_DIR)/.config.nopkg

	@KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \

		KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \

	@$(COMMON_CONFIG_ENV) \

		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \

		BUILDROOT_CONFIG=$(CONFIG_DIR)/.config $< -n $(CONFIG_CONFIG_IN)

		$< --allnoconfig $(CONFIG_CONFIG_IN)

	@rm -f $(CONFIG_DIR)/.config.nopkg



silentoldconfig: $(BUILD_DIR)/buildroot-config/conf

	@mkdir -p $(BUILD_DIR)/buildroot-config

	$(COMMON_CONFIG_ENV) $< --silentoldconfig $(CONFIG_CONFIG_IN)



defconfig: $(BUILD_DIR)/buildroot-config/conf

	@mkdir -p $(BUILD_DIR)/buildroot-config

	@KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \

		KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \

		BUILDROOT_CONFIG=$(CONFIG_DIR)/.config $< -d $(CONFIG_CONFIG_IN)

	@$(COMMON_CONFIG_ENV) $< --defconfig $(CONFIG_CONFIG_IN)



%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(TOPDIR)/configs/%_defconfig

	@mkdir -p $(BUILD_DIR)/buildroot-config

	@$(COMMON_CONFIG_ENV) $< --defconfig=$(TOPDIR)/configs/$@ $(CONFIG_CONFIG_IN)



savedefconfig: $(BUILD_DIR)/buildroot-config/conf

	@mkdir -p $(BUILD_DIR)/buildroot-config

	@$(COMMON_CONFIG_ENV) $< --savedefconfig=$(TOPDIR)/defconfig $(CONFIG_CONFIG_IN)



# check if download URLs are outdated

source-check: allyesconfig
@@ -589,10 +587,6 @@ endif 
flush:

	rm -f $(BUILD_DIR)/tgt-config.cache $(BUILD_DIR)/host-config.cache



%_defconfig: $(TOPDIR)/configs/%_defconfig

	cp $^ $(CONFIG_DIR)/.config

	@$(MAKE) $(EXTRAMAKEARGS) oldconfig



configured: dirs host-sed kernel-headers uclibc-config busybox-config linux26-config



prepatch:	gcc-patched binutils-patched gdb-patched uclibc-patched

package/config/.gitignore

+28 −9
Original line number Diff line number Diff line 
/conf

/mconf

/qconf

/qconf.moc

/.tmp_qtcheck

/lkc_defs.h

/lex.zconf.c

/zconf.hash.c

/zconf.tab.c
 
#

# Generated files

#

config*

lex.*.c

*.tab.c

*.tab.h

zconf.hash.c

*.moc

lkc_defs.h

gconf.glade.h

*.pot

*.mo



#

# configuration programs

#

conf

mconf

nconf

qconf

gconf

kxgettext



#

# Quilt is being used to handle the patch series

#

.pc

package/config/Makefile

+365 −53
Original line number Diff line number Diff line 
src := .

top_srcdir=../../

top_builddir=../../

srctree := .

obj ?= .



include Makefile.kconfig

#HOSTCFLAGS+=-Dinline="" -include foo.h

-include $(obj)/.depend

$(obj)/.depend: $(wildcard *.h *.c)

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) -MM *.c > $@ 2>/dev/null || :



__hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))

host-csingle := $(foreach m,$(__hostprogs),$(if $($(m)-objs),,$(m)))

host-cmulti := $(foreach m,$(__hostprogs),\

           $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m))))

host-cxxmulti := $(foreach m,$(__hostprogs),\

           $(if $($(m)-cxxobjs),$(m),$(if $($(m)-objs),)))

host-cobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-objs))))

host-cxxobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-cxxobjs))))



HOST_EXTRACFLAGS += -I$(obj)



$(host-csingle): %: %.c

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< $(HOST_LOADLIBES) -o $(obj)/$@



$(host-cmulti): %: $(host-cobjs) $(host-cshlib)

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs)) $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@



$(host-cxxmulti): %: $(host-cxxobjs) $(host-cobjs) $(host-cshlib)

	$(HOSTCXX) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs) $($(@F)-cxxobjs)) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@



$(obj)/%.o: %.c

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$(@F)) -c $< -o $@



$(obj)/%.o: $(obj)/%.c

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$(@F)) -c $< -o $@



$(obj)/%.o: %.cc

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$(@F)) -c $< -o $@



$(obj)/%:: $(src)/%_shipped

	$(Q)cat $< > $@



clean:

	$(Q)rm -f $(addprefix $(obj)/,$(clean-files))

distclean: clean

	$(Q)rm -f $(addprefix $(obj)/,$(lxdialog) $(conf-objs) $(mconf-objs) $(kxgettext-objs) \

		$(hostprogs-y) $(qconf-cxxobjs) $(qconf-objs) $(gconf-objs) \

		mconf .depend)



FORCE:

.PHONY: FORCE clean distclean
 
# ===========================================================================

# Kernel configuration targets

# These targets are used from top-level makefile



PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \

	localmodconfig localyesconfig



ifdef KBUILD_KCONFIG

Kconfig := $(KBUILD_KCONFIG)

else

Kconfig := arch/$(SRCARCH)/Kconfig

endif



xconfig: $(obj)/qconf

	$< $(Kconfig)



gconfig: $(obj)/gconf

	$< $(Kconfig)



menuconfig: $(obj)/mconf

	$< $(Kconfig)



config: $(obj)/conf

	$< --oldaskconfig $(Kconfig)



nconfig: $(obj)/nconf

	$< $(Kconfig)



oldconfig: $(obj)/conf

	$< --$@ $(Kconfig)



silentoldconfig: $(obj)/conf

	$(Q)mkdir -p include/generated

	$< --$@ $(Kconfig)



# if no path is given, then use src directory to find file

ifdef LSMOD

LSMOD_F := $(LSMOD)

ifeq ($(findstring /,$(LSMOD)),)

  LSMOD_F := $(objtree)/$(LSMOD)

endif

endif



localmodconfig: $(obj)/streamline_config.pl $(obj)/conf

	$(Q)mkdir -p include/generated

	$(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config

	$(Q)if [ -f .config ]; then 					\

			cmp -s .tmp.config .config ||			\

			(mv -f .config .config.old.1;			\

			 mv -f .tmp.config .config;			\

			 $(obj)/conf --silentoldconfig $(Kconfig);	\

			 mv -f .config.old.1 .config.old)		\

	else								\

			mv -f .tmp.config .config;			\

			$(obj)/conf --silentoldconfig $(Kconfig);	\

	fi

	$(Q)rm -f .tmp.config



localyesconfig: $(obj)/streamline_config.pl $(obj)/conf

	$(Q)mkdir -p include/generated

	$(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config

	$(Q)sed -i s/=m/=y/ .tmp.config

	$(Q)if [ -f .config ]; then					\

			cmp -s .tmp.config .config ||			\

			(mv -f .config .config.old.1;			\

			 mv -f .tmp.config .config;			\

			 $(obj)/conf --silentoldconfig $(Kconfig);	\

			 mv -f .config.old.1 .config.old)		\

	else								\

			mv -f .tmp.config .config;			\

			$(obj)/conf --silentoldconfig $(Kconfig);	\

	fi

	$(Q)rm -f .tmp.config



# Create new linux.pot file

# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files

# The symlink is used to repair a deficiency in arch/um

update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h

	$(Q)echo "  GEN config"

	$(Q)xgettext --default-domain=linux              \

	    --add-comments --keyword=_ --keyword=N_      \

	    --from-code=UTF-8                            \

	    --files-from=scripts/kconfig/POTFILES.in     \

	    --output $(obj)/config.pot

	$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot

	$(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch

	$(Q)(for i in `ls arch/*/Kconfig`;               \

	    do                                           \

		echo "  GEN $$i";                        \

		$(obj)/kxgettext $$i                     \

		     >> $(obj)/config.pot;               \

	    done )

	$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \

	    --output $(obj)/linux.pot

	$(Q)rm -f arch/um/Kconfig.arch

	$(Q)rm -f $(obj)/config.pot



PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig



allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf

	$< --$@ $(Kconfig)



PHONY += listnewconfig oldnoconfig savedefconfig defconfig



listnewconfig oldnoconfig: $(obj)/conf

	$< --$@ $(Kconfig)



savedefconfig: $(obj)/conf

	$< --$@=defconfig $(Kconfig)



defconfig: $(obj)/conf

ifeq ($(KBUILD_DEFCONFIG),)

	$< --defconfig $(Kconfig)

else

	@echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"

	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)

endif



%_defconfig: $(obj)/conf

	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)



# Help text used by make help

help:

	@echo  '  config	  - Update current config utilising a line-oriented program'

	@echo  '  nconfig         - Update current config utilising a ncurses menu based program'

	@echo  '  menuconfig	  - Update current config utilising a menu based program'

	@echo  '  xconfig	  - Update current config utilising a QT based front-end'

	@echo  '  gconfig	  - Update current config utilising a GTK based front-end'

	@echo  '  oldconfig	  - Update current config utilising a provided .config as base'

	@echo  '  localmodconfig  - Update current config disabling modules not loaded'

	@echo  '  localyesconfig  - Update current config converting local mods to core'

	@echo  '  silentoldconfig - Same as oldconfig, but quietly, additionally update deps'

	@echo  '  defconfig	  - New config with default from ARCH supplied defconfig'

	@echo  '  savedefconfig   - Save current config as ./defconfig (minimal config)'

	@echo  '  allnoconfig	  - New config where all options are answered with no'

	@echo  '  allyesconfig	  - New config where all options are accepted with yes'

	@echo  '  allmodconfig	  - New config selecting modules when possible'

	@echo  '  alldefconfig    - New config with all symbols set to default'

	@echo  '  randconfig	  - New config with random answer to all options'

	@echo  '  listnewconfig   - List new options'

	@echo  '  oldnoconfig     - Same as silentoldconfig but set new symbols to n (unset)'



# lxdialog stuff

check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh



# Use recursively expanded variables so we do not call gcc unless

# we really need to do so. (Do not call gcc as part of make mrproper)

HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)

HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))



HOST_EXTRACFLAGS += -DLOCALE





# ===========================================================================

# Shared Makefile for the various kconfig executables:

# conf:	  Used for defconfig, oldconfig and related targets

# nconf:  Used for the nconfig target.

#         Utilizes ncurses

# mconf:  Used for the menuconfig target

#         Utilizes the lxdialog package

# qconf:  Used for the xconfig target

#         Based on QT which needs to be installed to compile it

# gconf:  Used for the gconfig target

#         Based on GTK which needs to be installed to compile it

# object files used by all kconfig flavours



lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o

lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o



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

mconf-objs     := mconf.o zconf.tab.o $(lxdialog)

nconf-objs     := nconf.o zconf.tab.o nconf.gui.o

kxgettext-objs	:= kxgettext.o zconf.tab.o



hostprogs-y := conf qconf gconf kxgettext



ifeq ($(MAKECMDGOALS),nconfig)

	hostprogs-y += nconf

endif

ifeq ($(findstring nconf,$(MAKECMDGOALS)),nconf)

       hostprogs-y += nconf

endif



ifeq ($(MAKECMDGOALS),menuconfig)

	hostprogs-y += mconf

endif

ifeq ($(findstring mconf,$(MAKECMDGOALS)),mconf)

       hostprogs-y += mconf

endif



ifeq ($(MAKECMDGOALS),xconfig)

	qconf-target := 1

endif

ifeq ($(findstring qconf,$(MAKECMDGOALS)),qconf)

	qconf-target := 1

endif



ifeq ($(MAKECMDGOALS),gconfig)

	gconf-target := 1

endif

ifeq ($(findstring gconf,$(MAKECMDGOALS)),gconf)

	gconf-target := 1

endif



ifeq ($(qconf-target),1)

qconf-cxxobjs	:= qconf.o

qconf-objs	:= kconfig_load.o zconf.tab.o

endif



ifeq ($(gconf-target),1)

gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o

endif



clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \

               .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h

clean-files += config.pot linux.pot

clean-files += conf $(conf-objs)

clean-files += mconf $(mconf-objs)

clean-files += nconf $(nconf-objs)

clean-files += qconf qconf.o

clean-files += gconf gconf.o

clean-files += kconfig_load.o zconf.tab.o

clean-files += $(kxgettext-objs)



# Check that we have the required ncurses stuff installed for lxdialog (menuconfig)

PHONY += $(obj)/dochecklxdialog

$(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog

$(obj)/dochecklxdialog:

	$(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES)



always := dochecklxdialog



# Add environment specific flags

HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS))



# generated files seem to need this to find local include files

HOSTCFLAGS_lex.zconf.o	:= -I$(src)

HOSTCFLAGS_zconf.tab.o	:= -I$(src)



HOSTLOADLIBES_qconf	= $(KC_QT_LIBS) -ldl

HOSTCXXFLAGS_qconf.o	= $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK



HOSTLOADLIBES_gconf	= `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl

HOSTCFLAGS_gconf.o	= `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \

                          -D LKC_DIRECT_LINK



HOSTLOADLIBES_nconf	= -lmenu -lpanel -lncurses

$(obj)/qconf.o: $(obj)/.tmp_qtcheck



ifeq ($(qconf-target),1)

$(obj)/.tmp_qtcheck: $(src)/Makefile

-include $(obj)/.tmp_qtcheck



# QT needs some extra effort...

$(obj)/.tmp_qtcheck:

	@set -e; echo "  CHECK   qt"; dir=""; pkg=""; \

	pkg-config --exists qt 2> /dev/null && pkg=qt; \

	pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \

	if [ -n "$$pkg" ]; then \

	  cflags="\$$(shell pkg-config $$pkg --cflags)"; \

	  libs="\$$(shell pkg-config $$pkg --libs)"; \

	  moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \

	  dir="$$(pkg-config $$pkg --variable=prefix)"; \

	else \

	  for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \

	    if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \

	  done; \

	  if [ -z "$$dir" ]; then \

	    echo "*"; \

	    echo "* Unable to find the QT3 installation. Please make sure that"; \

	    echo "* the QT3 development package is correctly installed and"; \

	    echo "* either install pkg-config or set the QTDIR environment"; \

	    echo "* variable to the correct location."; \

	    echo "*"; \

	    false; \

	  fi; \

	  libpath=$$dir/lib; lib=qt; osdir=""; \

	  $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \

	    osdir=x$$($(HOSTCXX) -print-multi-os-directory); \

	  test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \

	  test -f $$libpath/libqt-mt.so && lib=qt-mt; \

	  cflags="-I$$dir/include"; \

	  libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \

	  moc="$$dir/bin/moc"; \

	fi; \

	if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \

	  echo "*"; \

	  echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \

	  echo "*"; \

	  moc="/usr/bin/moc"; \

	fi; \

	echo "KC_QT_CFLAGS=$$cflags" > $@; \

	echo "KC_QT_LIBS=$$libs" >> $@; \

	echo "KC_QT_MOC=$$moc" >> $@

endif



$(obj)/gconf.o: $(obj)/.tmp_gtkcheck



ifeq ($(gconf-target),1)

-include $(obj)/.tmp_gtkcheck



# GTK needs some extra effort, too...

$(obj)/.tmp_gtkcheck:

	@if `pkg-config --exists gtk+-2.0 gmodule-2.0 libglade-2.0`; then		\

		if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then			\

			touch $@;								\

		else									\

			echo "*"; 							\

			echo "* GTK+ is present but version >= 2.0.0 is required.";	\

			echo "*";							\

			false;								\

		fi									\

	else										\

		echo "*"; 								\

		echo "* Unable to find the GTK+ installation. Please make sure that"; 	\

		echo "* the GTK+ 2.0 development package is correctly installed..."; 	\

		echo "* You need gtk+-2.0, glib-2.0 and libglade-2.0."; 		\

		echo "*"; 								\

		false;									\

	fi

endif



$(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.hash.c



$(obj)/kconfig_load.o: $(obj)/lkc_defs.h



$(obj)/qconf.o: $(obj)/qconf.moc $(obj)/lkc_defs.h



$(obj)/gconf.o: $(obj)/lkc_defs.h



$(obj)/%.moc: $(src)/%.h

	$(KC_QT_MOC) -i $< -o $@



$(obj)/lkc_defs.h: $(src)/lkc_proto.h

	sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'



# Extract gconf menu items for I18N support

$(obj)/gconf.glade.h: $(obj)/gconf.glade

	intltool-extract --type=gettext/glade $(obj)/gconf.glade



###

# The following requires flex/bison/gperf

# By default we use the _shipped versions, uncomment the following line if

# you are modifying the flex/bison src.

# LKC_GENPARSER := 1



ifdef LKC_GENPARSER



$(obj)/zconf.tab.c: $(src)/zconf.y

$(obj)/lex.zconf.c: $(src)/zconf.l

$(obj)/zconf.hash.c: $(src)/zconf.gperf



%.tab.c: %.y

	bison -l -b $* -p $(notdir $*) $<

	cp $@ $@_shipped



lex.%.c: %.l

	flex -L -P$(notdir $*) -o$@ $<

	cp $@ $@_shipped



%.hash.c: %.gperf

	gperf < $< > $@

	cp $@ $@_shipped



endif

package/config/Makefile.br

0 → 100644
+53 −0
Original line number Diff line number Diff line 
src := .

top_srcdir=../../

top_builddir=../../

srctree := .

obj ?= .



include Makefile

#HOSTCFLAGS+=-Dinline="" -include foo.h

-include $(obj)/.depend

$(obj)/.depend: $(wildcard *.h *.c)

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) -MM *.c > $@ 2>/dev/null || :



__hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))

host-csingle := $(foreach m,$(__hostprogs),$(if $($(m)-objs),,$(m)))

host-cmulti := $(foreach m,$(__hostprogs),\

           $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m))))

host-cxxmulti := $(foreach m,$(__hostprogs),\

           $(if $($(m)-cxxobjs),$(m),$(if $($(m)-objs),)))

host-cobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-objs))))

host-cxxobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-cxxobjs))))



HOST_EXTRACFLAGS += -I$(obj)



$(host-csingle): %: %.c

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< $(HOST_LOADLIBES) -o $(obj)/$@



$(host-cmulti): %: $(host-cobjs) $(host-cshlib)

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs)) $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@



$(host-cxxmulti): %: $(host-cxxobjs) $(host-cobjs) $(host-cshlib)

	$(HOSTCXX) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs) $($(@F)-cxxobjs)) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@



$(obj)/%.o: %.c

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$(@F)) -c $< -o $@



$(obj)/%.o: $(obj)/%.c

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$(@F)) -c $< -o $@



$(obj)/%.o: %.cc

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$(@F)) -c $< -o $@



$(obj)/%:: $(src)/%_shipped

	$(Q)cat $< > $@



clean:

	$(Q)rm -f $(addprefix $(obj)/,$(clean-files))

distclean: clean

	$(Q)rm -f $(addprefix $(obj)/,$(lxdialog) $(conf-objs) $(mconf-objs) $(kxgettext-objs) \

		$(hostprogs-y) $(qconf-cxxobjs) $(qconf-objs) $(gconf-objs) \

		mconf .depend)



FORCE:

.PHONY: FORCE clean distclean

package/config/Makefile.kconfig

deleted100644 → 0
+0 −303

File deleted.

Preview size limit exceeded, changes collapsed.