Skip to content

Commit 0b5bf02

Browse files
committed
Stop installing headers into includedir/gap/src
No currently distributed package needs this anymore
1 parent 45c8a7a commit 0b5bf02

File tree

4 files changed

+0
-19
lines changed

4 files changed

+0
-19
lines changed

Makefile.rules

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -648,15 +648,6 @@ install-headers: $(FFDATA_H) build/version.h
648648
$(INSTALL) -m 0644 $(builddir)/build/version.h $(DESTDIR)$(includedir)/gap
649649
$(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/gap/hpc
650650
$(INSTALL) -m 0644 $(srcdir)/src/hpc/*.h $(DESTDIR)$(includedir)/gap/hpc
651-
# For compatibility with GAP packages still using `#include "src/compiled.h"`
652-
# and similar, also install copies of all headers into a `src` directory
653-
# TODO: remove this once no distributed packages needs it anymore
654-
$(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/gap/src
655-
$(INSTALL) -m 0644 $(srcdir)/src/*.h $(DESTDIR)$(includedir)/gap/src
656-
$(INSTALL) -m 0644 $(FFDATA_H) $(DESTDIR)$(includedir)/gap/src
657-
$(INSTALL) -m 0644 $(builddir)/build/version.h $(DESTDIR)$(includedir)/gap/src
658-
$(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/gap/src/hpc
659-
$(INSTALL) -m 0644 $(srcdir)/src/hpc/*.h $(DESTDIR)$(includedir)/gap/src/hpc
660651

661652
install-libgap: libgap.la libgap.pc
662653
$(INSTALL) -d -m 0755 $(DESTDIR)$(libdir)

README.buildsys.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ far off.
125125
Compatibility mode does the following things:
126126

127127
* create a `bin/gap.sh` shell script invoking `gap`
128-
* for out-of-tree builds, it creates a `${builddir}/src/compiled.h` file
129128
* ...
130129

131130
For now, using compatibility mode is required if one wants to build the
@@ -225,7 +224,6 @@ One final remark: some of the generated files differ for HPC-GAP. If you want
225224
to cross compile HPC-GAP, you need to generate them with HPC-GAP, and place
226225
them into `src/hpc` instead of `src`, like in this example:
227226

228-
229227
./configure --enable-hpcgap
230228
make
231229
cp build/c_*.c src/hpc/

configure.ac

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -956,13 +956,6 @@ AS_IF([test "x$enable_compat_mode" = xyes],
956956
],
957957
[
958958
AC_MSG_NOTICE([out-of-tree build])
959-
# FIXME: the following config command works if invoked
960-
# explicitly, but for some reason is not added to the list
961-
# of automatic command
962-
AC_CONFIG_COMMANDS([src/compiled.h],
963-
[
964-
echo "#include \"$ac_abs_top_srcdir/src/compiled.h\"" > src/compiled.h
965-
])
966959
])
967960
])
968961

dev/ci.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ GAPInput
234234
test -f $GAPPREFIX/bin/gac
235235
test -f $GAPPREFIX/include/gap/gap_all.h
236236
test -f $GAPPREFIX/include/gap/version.h
237-
test -f $GAPPREFIX/include/gap/src/compiled.h # for backwards compatibility
238237
test -f $GAPPREFIX/lib/gap/sysinfo.gap
239238
test -f $GAPPREFIX/lib/pkgconfig/libgap.pc
240239
test -f $GAPPREFIX/share/gap/doc/ref/chap0_mj.html

0 commit comments

Comments
 (0)