Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop installing headers into ${includedir}/gap/src #5435

Merged
merged 1 commit into from
May 11, 2023
Merged

Stop installing headers into ${includedir}/gap/src #5435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions Makefile.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,15 +648,6 @@ install-headers: $(FFDATA_H) build/version.h
$(INSTALL) -m 0644 $(builddir)/build/version.h $(DESTDIR)$(includedir)/gap
$(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/gap/hpc
$(INSTALL) -m 0644 $(srcdir)/src/hpc/*.h $(DESTDIR)$(includedir)/gap/hpc
# For compatibility with GAP packages still using `#include "src/compiled.h"`
# and similar, also install copies of all headers into a `src` directory
# TODO: remove this once no distributed packages needs it anymore
$(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/gap/src
$(INSTALL) -m 0644 $(srcdir)/src/*.h $(DESTDIR)$(includedir)/gap/src
$(INSTALL) -m 0644 $(FFDATA_H) $(DESTDIR)$(includedir)/gap/src
$(INSTALL) -m 0644 $(builddir)/build/version.h $(DESTDIR)$(includedir)/gap/src
$(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/gap/src/hpc
$(INSTALL) -m 0644 $(srcdir)/src/hpc/*.h $(DESTDIR)$(includedir)/gap/src/hpc

install-libgap: libgap.la libgap.pc
$(INSTALL) -d -m 0755 $(DESTDIR)$(libdir)
Expand Down
2 changes: 0 additions & 2 deletions README.buildsys.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ far off.
Compatibility mode does the following things:

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

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


./configure --enable-hpcgap
make
cp build/c_*.c src/hpc/
Expand Down
7 changes: 0 additions & 7 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,13 +956,6 @@ AS_IF([test "x$enable_compat_mode" = xyes],
],
[
AC_MSG_NOTICE([out-of-tree build])
# FIXME: the following config command works if invoked
# explicitly, but for some reason is not added to the list
# of automatic command
AC_CONFIG_COMMANDS([src/compiled.h],
[
echo "#include \"$ac_abs_top_srcdir/src/compiled.h\"" > src/compiled.h
])
])
])

Expand Down
1 change: 0 additions & 1 deletion dev/ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ GAPInput
test -f $GAPPREFIX/bin/gac
test -f $GAPPREFIX/include/gap/gap_all.h
test -f $GAPPREFIX/include/gap/version.h
test -f $GAPPREFIX/include/gap/src/compiled.h # for backwards compatibility
test -f $GAPPREFIX/lib/gap/sysinfo.gap
test -f $GAPPREFIX/lib/pkgconfig/libgap.pc
test -f $GAPPREFIX/share/gap/doc/ref/chap0_mj.html
Expand Down