Browse Source

Install "pure data" directories

... and update .gitignore. Survives 'make distcheck'.

Signed-off-by: Alexey Neyman <stilor@att.net>
dev-linux
Alexey Neyman 5 years ago
parent
commit
9dc94f3662
  1. 10
      .gitignore
  2. 4
      Makefile.am
  3. 9
      bootstrap
  4. 6
      configure.ac
  5. 9
      kconfig/Makefile.am
  6. 1
      scripts/ylwrap

10
.gitignore vendored

@ -7,15 +7,15 @@ config.log
config.status
Makefile
Makefile.in
*ct-ng*
ct-ng
!ct-ng.comp
!ct-ng.in
paths.*
!paths.in
config/configure.in
config/gen/
config/versions/
.config
verbatim-data.mk
maintainer/package-versions
# Temporaries
@ -26,9 +26,7 @@ temp.*
# This is the place where toolchains are built
.build/
# .. and the legacy location
targets/
# .. and log for 'build-all'
.build-all
.build-all/
# .. and release creation
release
release/

4
Makefile.am

@ -1,12 +1,16 @@
## Process this file with automake to produce Makefile.in
## vim: set noet :
include verbatim-data.mk
SUBDIRS = kconfig
bin_SCRIPTS = ct-ng
CLEANFILES = $(bin_SCRIPTS)
EXTRA_DIST = ct-ng.in bootstrap
nobase_dist_pkgdata_DATA = $(verbatim_data)
do_subst = ( @SED@ \
-e 's,[@]bindir[@],$(bindir),g' \
-e 's,[@]libdir[@],$(libdir),g' \

9
bootstrap

@ -738,6 +738,15 @@ gen_selection menu debug "Debug facilities"
gen_selection menu comp_tools "Companion tools"
gen_selection menu comp_libs "Companion libraries"
msg "*** Gathering the list of data files to install"
{
echo -n "verbatim_data ="
find config contrib packages samples scripts -type f | LANG=C sort | while read f; do
echo " \\"
echo -n " ${f}"
done
} > verbatim-data.mk
msg "*** Running autoreconf"
autoreconf -Wall --force

6
configure.ac

@ -15,7 +15,11 @@ AC_CONFIG_AUX_DIR([scripts])
AC_CONFIG_MACRO_DIR([m4])
# TBD try to use gnu strictness? Just add the missing files?
AM_INIT_AUTOMAKE([-Wall -Werror foreign no-dist-gzip dist-xz dist-bzip2 subdir-objects])
# Set automake defaults:
# - Tarballs are compressed with xz and bzip2
# - Object files are generated in a subdirectory (new default in automake)
# - Request new tar format (old, tar-v7, breaks on long paths we have)
AM_INIT_AUTOMAKE([-Wall -Werror foreign no-dist-gzip dist-xz dist-bzip2 subdir-objects tar-pax])
#--------------------------------------------------------------------
# Allow dummy --{en,dis}able-{static,shared}

9
kconfig/Makefile.am

@ -1,16 +1,21 @@
## vim: set noet :
## TBD turn off program renaming for these? Or account for it in ct-ng script?
## TBD when kconfig is split into a subpackage, need to remove this option from sub-configure
transform = s,x,x,
## TBD install into lib/crosstool-ng/kconfig? or move to libexec which seems more suitable
pkglibexec_PROGRAMS = conf nconf mconf
AM_LFLAGS = -L -Pzconf
AM_YFLAGS = -l -b zconf -p zconf
EXTRA_DIST = zconf.y zconf.l \
expr.h list.h lkc.h lkc_proto.h nconf.h lxdialog/dialog.h \
confdata.c expr.c kconf_id.c menu.c symbol.c util.c
CLEANFILES = zconf.lex.c zconf.c
BUILT_SOURCES = zconf.c zconf.lex.c
AM_LFLAGS = -L -Pzconf
AM_YFLAGS = -l -b zconf -p zconf
AM_CPPFLAGS = -include config.h -DCONFIG_=\"CT_\"
conf_SOURCES = conf.c zconf.c

1
scripts/ylwrap

@ -1 +0,0 @@
/usr/share/automake-1.15/ylwrap
Loading…
Cancel
Save