1.1 --- a/Makefile.in	Mon Nov 07 22:28:40 2011 +0100
     1.2 +++ b/Makefile.in	Sat Jan 14 18:22:06 2012 +0100
     1.3 @@ -39,29 +39,37 @@
     1.4  # Configuration variables
     1.5  
     1.6  # Stuff found by ./configure
     1.7 -DATE            := @DATE@
     1.8 -LOCAL           := @enable_local@
     1.9 -PROG_SED        := @program_transform_name@
    1.10 -PACKAGE_TARNAME := @PACKAGE_TARNAME@
    1.11 -VERSION         := @PACKAGE_VERSION@
    1.12 -prefix          := @prefix@
    1.13 -exec_prefix     := @exec_prefix@
    1.14 -bindir          := @bindir@
    1.15 -libdir          := @libdir@@sublibdir@
    1.16 -docdir          := @docdir@@subdocdir@
    1.17 -datarootdir     := @datarootdir@
    1.18 -mandir          := @mandir@
    1.19 -install         := @INSTALL@
    1.20 -bash            := @_BASH@
    1.21 -grep            := @EGREP@
    1.22 -make            := @MAKE@
    1.23 -sed             := @SED@
    1.24 -libtool         := @LIBTOOL@
    1.25 -libtoolize      := @LIBTOOLIZE@
    1.26 -objcopy         := @OBJCOPY@
    1.27 -objdump         := @OBJDUMP@
    1.28 -readelf         := @READELF@
    1.29 -patch           := @PATCH@
    1.30 +export DATE            := @DATE@
    1.31 +export LOCAL           := @enable_local@
    1.32 +export PROG_SED        := @program_transform_name@
    1.33 +export PACKAGE_TARNAME := @PACKAGE_TARNAME@
    1.34 +export VERSION         := @PACKAGE_VERSION@
    1.35 +export prefix          := @prefix@
    1.36 +export exec_prefix     := @exec_prefix@
    1.37 +export bindir          := @bindir@
    1.38 +export libdir          := @libdir@@sublibdir@
    1.39 +export docdir          := @docdir@@subdocdir@
    1.40 +export mandir          := @mandir@
    1.41 +export datarootdir     := @datarootdir@
    1.42 +export install         := @INSTALL@
    1.43 +export bash            := @_BASH@
    1.44 +export grep            := @EGREP@
    1.45 +export make            := @MAKE@
    1.46 +export sed             := @SED@
    1.47 +export libtool         := @LIBTOOL@
    1.48 +export libtoolize      := @LIBTOOLIZE@
    1.49 +export objcopy         := @OBJCOPY@
    1.50 +export objdump         := @OBJDUMP@
    1.51 +export readelf         := @READELF@
    1.52 +export patch           := @PATCH@
    1.53 +export CC              := @CC@
    1.54 +export CPP             := @CPP@
    1.55 +export CPPFLAGS        := @CPPFLAGS@
    1.56 +export CFLAGS          := @CFLAGS@
    1.57 +export LDFLAGS         := @LDFLAGS@
    1.58 +export LIBS            := @LIBS@
    1.59 +export curses_hdr      := @ac_ct_curses_hdr@
    1.60 +export gettext         := @gettext@
    1.61  
    1.62  # config options to push down to kconfig
    1.63  KCONFIG:= @kconfig_options@
    1.64 @@ -113,7 +121,7 @@
    1.65  else
    1.66  # There were no additional MAKEFLAGS to add, do the job
    1.67  
    1.68 -TARGETS := bin lib doc man
    1.69 +TARGETS := bin lib lib-kconfig doc man
    1.70  
    1.71  build: $(patsubst %,build-%,$(TARGETS))
    1.72  
    1.73 @@ -137,10 +145,17 @@
    1.74  #--------------------------------------
    1.75  # Build rules
    1.76  
    1.77 -build-bin: $(PROG_NAME) scripts/crosstool-NG.sh scripts/saveSample.sh scripts/showTuple.sh
    1.78 +build-bin: $(PROG_NAME)             \
    1.79 +           scripts/crosstool-NG.sh  \
    1.80 +           scripts/saveSample.sh    \
    1.81 +           scripts/showTuple.sh
    1.82  	@chmod 755 $^
    1.83  
    1.84 -build-lib: paths.mk config/configure.in
    1.85 +build-lib: paths.mk             \
    1.86 +           config/configure.in
    1.87 +
    1.88 +build-lib-kconfig:
    1.89 +	@$(MAKE) -C kconfig
    1.90  
    1.91  build-doc:
    1.92  
    1.93 @@ -229,6 +244,9 @@
    1.94  	@echo "  RM     'config/configure.in'"
    1.95  	@rm -f config/configure.in
    1.96  
    1.97 +clean-lib-kconfig:
    1.98 +	@$(MAKE) -C kconfig clean
    1.99 +
   1.100  clean-doc:
   1.101  
   1.102  clean-man:
   1.103 @@ -263,9 +281,12 @@
   1.104  # installations of the same VERSION, thus the patches must be removed prior
   1.105  # to being installed. It is simpler to remove the whole lib/ directory, as it
   1.106  # is the goal of the install-lib rule to install the lib/ directory...
   1.107 -install-lib: uninstall-lib $(DESTDIR)$(libdir) install-lib-main install-lib-samples
   1.108 +install-lib: uninstall-lib          \
   1.109 +             $(DESTDIR)$(libdir)    \
   1.110 +             install-lib-main       \
   1.111 +             install-lib-samples
   1.112  
   1.113 -LIB_SUB_DIR := config contrib kconfig patches scripts
   1.114 +LIB_SUB_DIR := config contrib patches scripts
   1.115  $(patsubst %,install-lib-%-copy,$(LIB_SUB_DIR)): $(DESTDIR)$(libdir)
   1.116  	@echo "  INSTDIR '$(patsubst install-lib-%-copy,%,$(@))/'"
   1.117  	@tar cf - --exclude='*.sh.in' $(patsubst install-lib-%-copy,%,$(@)) \
   1.118 @@ -306,6 +327,13 @@
   1.119  	 done
   1.120  	@$(install) -m 644 samples/samples.mk "$(DESTDIR)$(libdir)/samples/samples.mk"
   1.121  
   1.122 +KCONFIG_FILES := conf mconf nconf kconfig.mk
   1.123 +install-lib-kconfig: $(DESTDIR)$(libdir) install-lib-main
   1.124 +	@echo "  INST    'kconfig/'"
   1.125 +	@for f in $(KCONFIG_FILES); do                                      \
   1.126 +	    install -D "kconfig/$${f}" "$(DESTDIR)$(libdir)/kconfig/$${f}"; \
   1.127 +	 done
   1.128 +
   1.129  install-doc: $(DESTDIR)$(docdir)
   1.130  	@echo "  INST    'docs/*.txt'"
   1.131  	@for doc_file in docs/*.txt; do                              \