summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2018-02-24 03:05:41 (GMT)
committerAlexey Neyman <stilor@att.net>2018-04-07 19:03:17 (GMT)
commit9dc94f36627ec79721e485bb4ae50af9fb67c9fc (patch)
tree42fc3520fbb9d6c30c61f3c3f0ff5ae2ac961cad
parent69df9ae9ddb806b42d962ae8a0b2b8f7b31f480e (diff)
Install "pure data" directories
... and update .gitignore. Survives 'make distcheck'. Signed-off-by: Alexey Neyman <stilor@att.net>
-rw-r--r--.gitignore10
-rw-r--r--Makefile.am4
-rwxr-xr-xbootstrap9
-rw-r--r--configure.ac6
-rw-r--r--kconfig/Makefile.am9
l---------scripts/ylwrap1
6 files changed, 29 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 292a4f5..eb7d491 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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/
diff --git a/Makefile.am b/Makefile.am
index 37996f8..c58c45f 100644
--- a/Makefile.am
+++ b/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' \
diff --git a/bootstrap b/bootstrap
index 25453de..d5d17d4 100755
--- a/bootstrap
+++ b/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
diff --git a/configure.ac b/configure.ac
index bd7ccb4..20d5b42 100644
--- a/configure.ac
+++ b/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}
diff --git a/kconfig/Makefile.am b/kconfig/Makefile.am
index 413d944..a54c170 100644
--- a/kconfig/Makefile.am
+++ b/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
diff --git a/scripts/ylwrap b/scripts/ylwrap
deleted file mode 120000
index efe1e02..0000000
--- a/scripts/ylwrap
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/automake-1.15/ylwrap \ No newline at end of file