[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 07/33: src/utils: - fix 'make clean' and 'make dist' - add insta
From: |
Bertrand Garrigues |
Subject: |
[groff] 07/33: src/utils: - fix 'make clean' and 'make dist' - add install/uninstall custom rules for indxbib |
Date: |
Sun, 07 Sep 2014 23:02:04 +0000 |
bgarrigues pushed a commit to branch automake2
in repository groff.
commit 9bbfc341d00b96d0c42fcac9df305bd7a02aaf77
Author: Bertrand Garrigues <address@hidden>
Date: Tue Aug 19 23:36:40 2014 +0200
src/utils:
- fix 'make clean' and 'make dist'
- add install/uninstall custom rules for indxbib
Remove datasubdir and dataprogramdir
---
Makefile.am | 8 ++++++++
TESTS | 15 ++++++++++-----
src/utils/addftinfo/addftinfo.am | 1 +
src/utils/afmtodit/afmtodit.am | 7 +++++++
src/utils/hpftodit/hpftodit.am | 1 +
src/utils/indxbib/indxbib.am | 24 ++++++++++++++++++++++++
src/utils/lkbib/lkbib.am | 1 +
src/utils/lookbib/lookbib.am | 1 +
src/utils/pfbtops/pfbtops.am | 1 +
src/utils/tfmtodit/tfmtodit.am | 1 +
src/utils/xtotroff/xtotroff.am | 1 +
11 files changed, 56 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c2c0ccc..bbf48a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -546,6 +546,12 @@ BUILT_SOURCES += defs.h
# possible
lib/localcharset.$(OBJEXT): lib/configmake.h
+# directories specific to groff
+uninstall-hook: uninstall_groffdirs
+uninstall_groffdirs:
+ rmdir $(DESTDIR)$(datasubdir)
+ rmdir $(DESTDIR)$(dataprogramdir)
+
# Other files that should be present in the distribution tarball.
EXTRA_DIST += \
BUG-REPORT \
@@ -570,6 +576,8 @@ EXTRA_DIST += \
PROJECTS \
README.MinGW
+MOSTLYCLEANFILES += $(man1_MANS)
+
# Rule to build .man files. The brackets around the @ are used to prevent the
# substitution of the variable by automake.
.man.n:
diff --git a/TESTS b/TESTS
index e06e875..b29f6b7 100644
--- a/TESTS
+++ b/TESTS
@@ -13,6 +13,7 @@ Current status
- Gnulib integrated
- Minimum Automake support
- Build src/libs/*
+ - Build src/utils/*
Tests
-----
@@ -94,7 +95,7 @@ The following files remains (this is expected):
- src/include/stamp-h1
- .deps directories and .dirstamp files
-TODO: .n files, afmtodit
+ - .n files, afmtodit are cleaned
2.3 make mostlyclean
@@ -104,8 +105,6 @@ TODO: .n files, afmtodit
version.cpp.
- gnulib's charset.alias, ref-add.sed, ref-del.sed and configmake.h
-TODO: .n files, afmtodit
-
2.4 make distclean
Like 'make clean', but the following files are also cleaned:
@@ -144,6 +143,7 @@ TODO: .n files, afmtodit
to the list of programs using it. Otherwise nothing is installed.
- programs from src/utils are installed in $(DESTDIR)/usr/local/bin
- man files from src/utils are installed in
$(DESTDIR)/usr/local/share/man/man1
+ - $(DESTDIR)/usr/local/share/groff/1.22/eign (from src/utils/indxbib)
2.7 make uninstall
@@ -152,8 +152,10 @@ TODO: .n files, afmtodit
- $(DESTDIR)/usr/local/lib/charset.alias if exists
- $(DESTDIR)/usr/local/bin/*
- $(DESTDIR)/usr/local/man/man1/*
-
- TODO: indexbib specific rules
+ - $(DESTDIR)/usr/local/share/groff/1.22/eign
+ - $(DESTDIR)/usr/local/share/groff/1.22/
+ - $(DESTDIR)/usr/local/share/groff/
+
2.8 make dist
@@ -175,7 +177,10 @@ TODO: .n files, afmtodit
doc/
font/
man/
+ src/devices
src/include (except config.hin and include.am)
+ src/preproc
+ src/roff
tmac
test-groff.in
diff --git a/src/utils/addftinfo/addftinfo.am b/src/utils/addftinfo/addftinfo.am
index a454ce6..722fde0 100644
--- a/src/utils/addftinfo/addftinfo.am
+++ b/src/utils/addftinfo/addftinfo.am
@@ -1,5 +1,6 @@
bin_PROGRAMS += addftinfo
man1_MANS += src/utils/addftinfo/addftinfo.n
+EXTRA_DIST += src/utils/addftinfo/addftinfo.man
addftinfo_LDADD = libgroff.a
addftinfo_SOURCES = \
src/utils/addftinfo/addftinfo.cpp \
diff --git a/src/utils/afmtodit/afmtodit.am b/src/utils/afmtodit/afmtodit.am
index ebb4801..adb742e 100644
--- a/src/utils/afmtodit/afmtodit.am
+++ b/src/utils/afmtodit/afmtodit.am
@@ -22,6 +22,13 @@ afmtodit_srcdir = $(top_srcdir)/src/utils/afmtodit
bin_SCRIPTS += afmtodit
man1_MANS += src/utils/afmtodit/afmtodit.n
+EXTRA_DIST += \
+ src/utils/afmtodit/afmtodit.man \
+ src/utils/afmtodit/afmtodit.pl \
+ src/utils/afmtodit/afmtodit.tables \
+ src/utils/afmtodit/make-afmtodit-tables
+
+MOSTLYCLEANFILES += afmtodit
afmtodit: $(afmtodit_srcdir)/afmtodit.pl $(afmtodit_srcdir)/afmtodit.tables
if test -n "$(PERL)"; then \
diff --git a/src/utils/hpftodit/hpftodit.am b/src/utils/hpftodit/hpftodit.am
index 0971b01..27a2a06 100644
--- a/src/utils/hpftodit/hpftodit.am
+++ b/src/utils/hpftodit/hpftodit.am
@@ -1,5 +1,6 @@
bin_PROGRAMS += hpftodit
man1_MANS += src/utils/hpftodit/hpftodit.n
+EXTRA_DIST += src/utils/hpftodit/hpftodit.man
hpftodit_LDADD = libgroff.a $(LIBM)
hpftodit_SOURCES = \
src/utils/hpftodit/hpftodit.cpp \
diff --git a/src/utils/indxbib/indxbib.am b/src/utils/indxbib/indxbib.am
index 0efa1c2..aff316f 100644
--- a/src/utils/indxbib/indxbib.am
+++ b/src/utils/indxbib/indxbib.am
@@ -24,4 +24,28 @@ indxbib_SOURCES = \
src/utils/indxbib/indxbib.$(OBJEXT): defs.h
indxbib_LDADD = libbib.a libgroff.a $(LIBM)
man1_MANS += src/utils/indxbib/indxbib.n
+EXTRA_DIST += \
+ src/utils/indxbib/indxbib.man \
+ src/utils/indxbib/eign
+install-data-local: install_indxbib
+install_indxbib: $(indxbib_srcdir)/eign
+ -test -d $(DESTDIR)$(datadir) \
+ || $(mkinstalldirs) $(DESTDIR)$(datadir)
+ -test -d $(DESTDIR)$(dataprogramdir) \
+ || $(mkinstalldirs) $(DESTDIR)$(dataprogramdir)
+ -test -d $(DESTDIR)$(datasubdir) \
+ || $(mkinstalldirs) $(DESTDIR)$(datasubdir)
+ if test -f /usr/lib/eign; then \
+ rm -f $(DESTDIR)$(common_words_file); \
+ ln -s /usr/lib/eign $(DESTDIR)$(common_words_file) 2>/dev/null \
+ || ln /usr/lib/eign $(DESTDIR)$(common_words_file) 2>/dev/null \
+ || cp /usr/lib/eign $(DESTDIR)$(common_words_file); \
+ else \
+ rm -f $(DESTDIR)$(common_words_file); \
+ $(INSTALL_DATA) $(indxbib_srcdir)/eign
$(DESTDIR)$(common_words_file); \
+ fi
+
+uninstall-local: uninstall_indxbib
+uninstall_indxbib:
+ rm -f $(DESTDIR)$(common_words_file)
diff --git a/src/utils/lkbib/lkbib.am b/src/utils/lkbib/lkbib.am
index 82b4768..cd8d983 100644
--- a/src/utils/lkbib/lkbib.am
+++ b/src/utils/lkbib/lkbib.am
@@ -1,5 +1,6 @@
bin_PROGRAMS += lkbib
man1_MANS += src/utils/lkbib/lkbib.n
+EXTRA_DIST += src/utils/lkbib/lkbib.man
lkbib_LDADD = libbib.a libgroff.a $(LIBM)
lkbib_SOURCES = src/utils/lkbib/lkbib.cpp
src/utils/lkbib/lkbib.$(OBJEXT): defs.h
diff --git a/src/utils/lookbib/lookbib.am b/src/utils/lookbib/lookbib.am
index e24d4ef..2c8ceaa 100644
--- a/src/utils/lookbib/lookbib.am
+++ b/src/utils/lookbib/lookbib.am
@@ -1,4 +1,5 @@
bin_PROGRAMS += lookbib
man1_MANS += src/utils/lookbib/lookbib.n
+EXTRA_DIST += src/utils/lookbib/lookbib.man
lookbib_LDADD = libbib.a libgroff.a $(LIBM)
lookbib_SOURCES = src/utils/lookbib/lookbib.cpp
diff --git a/src/utils/pfbtops/pfbtops.am b/src/utils/pfbtops/pfbtops.am
index e59e74d..c37bf5f 100644
--- a/src/utils/pfbtops/pfbtops.am
+++ b/src/utils/pfbtops/pfbtops.am
@@ -1,5 +1,6 @@
bin_PROGRAMS += pfbtops
man1_MANS += src/utils/pfbtops/pfbtops.n
+EXTRA_DIST += src/utils/pfbtops/pfbtops.man
pfbtops_SOURCES = src/utils/pfbtops/pfbtops.c
pfbtops_LDADD = libgroff.a $(LIBM)
# We use the following trick to force the use of C++ compiler
diff --git a/src/utils/tfmtodit/tfmtodit.am b/src/utils/tfmtodit/tfmtodit.am
index 403b699..172e995 100644
--- a/src/utils/tfmtodit/tfmtodit.am
+++ b/src/utils/tfmtodit/tfmtodit.am
@@ -1,4 +1,5 @@
bin_PROGRAMS += tfmtodit
man1_MANS += src/utils/tfmtodit/tfmtodit.n
+EXTRA_DIST += src/utils/tfmtodit/tfmtodit.man
tfmtodit_SOURCES = src/utils/tfmtodit/tfmtodit.cpp
tfmtodit_LDADD = libgroff.a $(LIBM)
diff --git a/src/utils/xtotroff/xtotroff.am b/src/utils/xtotroff/xtotroff.am
index d439a09..7a76584 100644
--- a/src/utils/xtotroff/xtotroff.am
+++ b/src/utils/xtotroff/xtotroff.am
@@ -1,5 +1,6 @@
bin_PROGRAMS += xtotroff
man1_MANS += src/utils/xtotroff/xtotroff.n
+EXTRA_DIST += src/utils/xtotroff/xtotroff.man
xtotroff_SOURCES = src/utils/xtotroff/xtotroff.c
XLIBS=$(LIBXUTIL) $(LIBGROFF)
xtotroff_LDADD = libxutil.a libgroff.a $(X_LIBS) $(X_PRE_LIBS) \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 07/33: src/utils: - fix 'make clean' and 'make dist' - add install/uninstall custom rules for indxbib,
Bertrand Garrigues <=