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.

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

Build cleanup #85

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
8 changes: 0 additions & 8 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,4 @@ clean-all:

.PHONY: $(PHONY_TARGETS)

# TODO(jmmv): Remove after atf 0.22.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

install-data-hook:
cd $(DESTDIR)$(man3dir) && \
for binding in c c++ sh; do \
rm -f "atf-$${binding}-api.3"; \
$(LN_S) "atf-$${binding}.3" "atf-$${binding}-api.3"; \
done

# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
1 change: 0 additions & 1 deletion atf-c++/detail/Makefile.am.inc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

libatf_c___la_SOURCES += atf-c++/detail/application.cpp \
atf-c++/detail/application.hpp \
atf-c++/detail/auto_array.hpp \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one lgtm

atf-c++/detail/env.cpp \
atf-c++/detail/env.hpp \
atf-c++/detail/exceptions.cpp \
Expand Down
6 changes: 2 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ AM_PROG_CC_C_O
dnl The C compiler check automatically aborts if the compiler does not work.
dnl Nothing to do here.

AC_LANG(C++)
AC_PROG_CXX
AC_LANG_COMPILER(C++)
AX_CXX_COMPILE_STDCXX(14, noext, mandatory)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

AC_CACHE_CHECK([whether the C++ compiler works],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

[atf_cv_prog_cxx_works],
[AC_LANG_PUSH([C++])
Expand All @@ -73,9 +74,6 @@ fi

KYUA_DEVELOPER_MODE([C,C++])

dnl TODO(jmmv): Remove once the atf-*-api.3 symlinks are removed.
AC_PROG_LN_S

ATF_MODULE_APPLICATION
ATF_MODULE_DEFS
ATF_MODULE_ENV
Expand Down
Loading