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

Factored out source for each command #76

Merged
merged 10 commits into from
Oct 18, 2024
4 changes: 2 additions & 2 deletions .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ name: Source formatting with clang-format

on:
push:
branches: [ "main" ]
branches: [ "master" ]
pull_request:
branches: [ "main" ]
branches: [ "master" ]
workflow_dispatch:

jobs:
Expand Down
14 changes: 13 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is part of preseq
#
# Copyright (C) 2018-2022: Andrew D. Smith
# Copyright (C) 2018-2024: Andrew D. Smith
#
# Authors: Andrew D. Smith
#
Expand Down Expand Up @@ -33,6 +33,18 @@ endif

preseq_SOURCES = \
src/preseq.cpp \
src/common.hpp \
src/common.cpp \
src/c_curve.hpp \
src/c_curve.cpp \
src/gc_extrap.hpp \
src/gc_extrap.cpp \
src/lc_extrap.hpp \
src/lc_extrap.cpp \
src/bound_pop.hpp \
src/bound_pop.cpp \
src/pop_size.hpp \
src/pop_size.cpp \
src/continued_fraction.hpp \
src/continued_fraction.cpp \
src/load_data_for_complexity.hpp \
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dnl This file is part of preseq
dnl
dnl Copyright (C) 2018-2022: Andrew D. Smith
dnl Copyright (C) 2018-2024: Andrew D. Smith
dnl
dnl Authors: Andrew D. Smith
dnl
Expand All @@ -24,7 +24,7 @@ AM_INIT_AUTOMAKE([subdir-objects foreign])
AC_CONFIG_MACRO_DIR([m4])
AC_LANG(C++)
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
AX_CXX_COMPILE_STDCXX_17([noext], [mandatory])
AC_PROG_RANLIB

dnl recursively configure smithlab_cpp
Expand Down
19 changes: 8 additions & 11 deletions m4/ax_cxx_compile_stdcxx_11.m4 → m4/ax_cxx_compile_stdcxx_17.m4
Original file line number Diff line number Diff line change
@@ -1,39 +1,36 @@
# =============================================================================
# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_17.html
# =============================================================================
#
# SYNOPSIS
#
# AX_CXX_COMPILE_STDCXX_11([ext|noext], [mandatory|optional])
# AX_CXX_COMPILE_STDCXX_17([ext|noext], [mandatory|optional])
#
# DESCRIPTION
#
# Check for baseline language coverage in the compiler for the C++11
# Check for baseline language coverage in the compiler for the C++17
# standard; if necessary, add switches to CXX and CXXCPP to enable
# support.
#
# This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX
# macro with the version set to C++11. The two optional arguments are
# macro with the version set to C++17. The two optional arguments are
# forwarded literally as the second and third argument respectively.
# Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for
# more information. If you want to use this macro, you also need to
# download the ax_cxx_compile_stdcxx.m4 file.
#
# LICENSE
#
# Copyright (c) 2008 Benjamin Kosnik <[email protected]>
# Copyright (c) 2012 Zack Weinberg <[email protected]>
# Copyright (c) 2013 Roy Stogner <[email protected]>
# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <[email protected]>
# Copyright (c) 2015 Paul Norman <[email protected]>
# Copyright (c) 2015 Moritz Klammler <[email protected]>
# Copyright (c) 2016 Krzesimir Nowak <[email protected]>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.

#serial 18
#serial 2

AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])])
AC_DEFUN([AX_CXX_COMPILE_STDCXX_17], [AX_CXX_COMPILE_STDCXX([17], [$1], [$2])])

Loading