Simplify installation of OCaml header (.h) files

The tools/cleanup-header script has no effect any more, so stop
calling it during make install and remove it from the repository.
master
Sébastien Hinderer 2017-03-29 16:39:30 +02:00
parent e7cf3b1846
commit 255720556f
3 changed files with 3 additions and 35 deletions

1
.gitattributes vendored
View File

@ -105,7 +105,6 @@ stdlib/Compflags text eol=lf
stdlib/sharpbang text eol=lf
tools/check-typo text eol=lf
tools/ci-build text eol=lf
tools/cleanup-header text eol=lf
tools/msvs-promote-path text eol=lf
tools/gdb-macros text eol=lf
tools/magic text eol=lf

View File

@ -17,6 +17,7 @@ include ../config/Makefile
INSTALL_BINDIR=$(DESTDIR)$(BINDIR)
INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)
INSTALL_INCDIR=$(INSTALL_LIBDIR)/caml
# The PROGRAMS (resp. LIBRARIES) variable list the files to build and
# install as programs in $(INSTALL_BINDIR) (resp. libraries in
@ -105,11 +106,8 @@ ld.conf: ../config/Makefile
install:
cp $(PROGRAMS) "$(INSTALL_BINDIR)"
cp $(LIBRARIES) "$(INSTALL_LIBDIR)"
mkdir -p "$(INSTALL_LIBDIR)/caml"
for i in caml/*.h; do \
sed -f ../tools/cleanup-header $$i \
> "$(INSTALL_LIBDIR)/$$i"; \
done
mkdir -p "$(INSTALL_INCDIR)"
cp caml/*.h "$(INSTALL_INCDIR)"
# If primitives contain duplicated lines (e.g. because the code is defined
# like

View File

@ -1,29 +0,0 @@
#!/bin/sed -f
#**************************************************************************
#* *
#* OCaml *
#* *
#* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
#* *
#* Copyright 2002 Institut National de Recherche en Informatique et *
#* en Automatique. *
#* *
#* All rights reserved. This file is distributed under the terms of *
#* the GNU Lesser General Public License version 2.1, with the *
#* special exception on linking described in the file LICENSE. *
#* *
#**************************************************************************
# Remove private parts from runtime include files, before installation
# in /usr/local/lib/ocaml/caml
/\/\* <include m\.h> \*\// {
r m.h
d
}
/\/\* <include s\.h> \*\// {
r s.h
d
}
/\/\* <private> \*\//,/\/\* <\/private> \*\//d