Commit 02539d40 authored by Vivien Kraus's avatar Vivien Kraus
Browse files

Consistently use AM_LDADD

parent d41c0c3d
......@@ -60,7 +60,12 @@ AM_YFLAGS = -d
AM_CFLAGS += \
$(NETTLE_CFLAGS) $(XML_CFLAGS) $(OPENMP_CFLAGS)
AM_LDADD += \
$(NETTLE_LIBS) $(XML_LIBS) $(GUILE_LIBS) $(OPENMP_LIBS)
$(NETTLE_LIBS) $(XML_LIBS) $(GUILE_LIBS) $(OPENMP_LIBS) \
$(LIBTHREAD) \
$(LIB_SETLOCALE) \
$(LIB_SETLOCALE_NULL) \
$(LTLIBINTL) \
@INTL_MACOSX_LIBS@
if WITH_GOBJECT
AM_CFLAGS += $(GOBJECT_CFLAGS)
......
# tarot implements the rules of the tarot game
# Copyright (C) 2018, 2019 Vivien Kraus
# Copyright (C) 2018, 2019, 2020 Vivien Kraus
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -60,9 +60,7 @@ dist_man6_MANS +=
$(GOBJECT_LIBS) \
$(CAIRO_LIBS) \
$(GTK_LIBS) \
$(LTLIBINTL) \
$(LTLIBTHREAD) \
@INTL_MACOSX_LIBS@
$(AM_LDADD)
TESTS += $(TAROT_CLI_TESTS)
endif # not ENABLE_PROGRAM
......
# tarot implements the rules of the tarot game
# Copyright (C) 2019 Vivien Kraus
# Copyright (C) 2019, 2020 Vivien Kraus
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -21,8 +21,6 @@ bin_PROGRAMS += %reldir%/tarot-cnn-features
%reldir%/libprogram-commons.la \
lib/libgnu.la \
src/libtarot/libtarot.la \
$(LTLIBINTL) \
$(LTLIBTHREAD) \
@INTL_MACOSX_LIBS@
$(AM_LDADD)
INDENTED += %reldir%/tarot_cnn_features.c
# tarot implements the rules of the tarot game
# Copyright (C) 2019 Vivien Kraus
# Copyright (C) 2019, 2020 Vivien Kraus
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -21,8 +21,6 @@ bin_PROGRAMS += %reldir%/tarot-cnn
%reldir%/libprogram-commons.la \
lib/libgnu.la \
src/libtarot/libtarot.la \
$(LTLIBINTL) \
$(LTLIBTHREAD) \
@INTL_MACOSX_LIBS@
$(AM_LDADD)
INDENTED += %reldir%/tarot_cnn.c
# tarot implements the rules of the tarot game
# Copyright (C) 2019 Vivien Kraus
# Copyright (C) 2019, 2020 Vivien Kraus
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -21,8 +21,6 @@ bin_PROGRAMS += %reldir%/tarot-deal
%reldir%/libprogram-commons.la \
lib/libgnu.la \
src/libtarot/libtarot.la \
$(LTLIBINTL) \
$(LTLIBTHREAD) \
@INTL_MACOSX_LIBS@
$(AM_LDADD)
INDENTED += %reldir%/tarot_deal.c
# tarot implements the rules of the tarot game
# Copyright (C) 2019 Vivien Kraus
# Copyright (C) 2019, 2020 Vivien Kraus
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -21,8 +21,6 @@ bin_PROGRAMS += %reldir%/tarot-features
%reldir%/libprogram-commons.la \
lib/libgnu.la \
src/libtarot/libtarot.la \
$(LTLIBINTL) \
$(LTLIBTHREAD) \
@INTL_MACOSX_LIBS@
$(AM_LDADD)
INDENTED += %reldir%/tarot_features.c
# tarot implements the rules of the tarot game
# Copyright (C) 2019 Vivien Kraus
# Copyright (C) 2019, 2020 Vivien Kraus
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -21,8 +21,6 @@ bin_PROGRAMS += %reldir%/tarot-mcts
%reldir%/libprogram-commons.la \
lib/libgnu.la \
src/libtarot/libtarot.la \
$(LTLIBINTL) \
$(LTLIBTHREAD) \
@INTL_MACOSX_LIBS@
$(AM_LDADD)
INDENTED += %reldir%/tarot_mcts.c
# tarot implements the rules of the tarot game
# Copyright (C) 2019 Vivien Kraus
# Copyright (C) 2019, 2020 Vivien Kraus
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -21,9 +21,6 @@ bin_PROGRAMS += %reldir%/tarot-perceptron-bootstrap
%reldir%/libprogram-commons.la \
lib/libgnu.la \
src/libtarot/libtarot.la \
$(LTLIBINTL) \
$(LTLIBTHREAD) \
@INTL_MACOSX_LIBS@ \
$(AM_LIBS)
$(AM_LDADD)
INDENTED += %reldir%/tarot_perceptron_bootstrap.c
# tarot implements the rules of the tarot game
# Copyright (C) 2019 Vivien Kraus
# Copyright (C) 2019, 2020 Vivien Kraus
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -22,9 +22,7 @@ noinst_LTLIBRARIES += %reldir%/libprogram-commons.la
%canon_reldir%_libprogram_commons_la_LTLIBADD = \
lib/libgnu.la \
src/libtarot/libtarot.la \
$(LTLIBINTL) \
$(LTLIBTHREAD) \
@INTL_MACOSX_LIBS@
$(AM_LDADD)
INDENTED += %reldir%/program_commons.h \
%reldir%/program_commons.c
# tarot implements the rules of the tarot game
# Copyright (C) 2019 Vivien Kraus
# Copyright (C) 2019, 2020 Vivien Kraus
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -21,8 +21,6 @@ bin_PROGRAMS += %reldir%/tarot-stacking
%reldir%/libprogram-commons.la \
lib/libgnu.la \
src/libtarot/libtarot.la \
$(LTLIBINTL) \
$(LTLIBTHREAD) \
@INTL_MACOSX_LIBS@
$(AM_LDADD)
INDENTED += %reldir%/tarot_stacking.c
# tarot implements the rules of the tarot game
# Copyright (C) 2019 Vivien Kraus
# Copyright (C) 2019, 2020 Vivien Kraus
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -21,8 +21,6 @@ bin_PROGRAMS += %reldir%/tarot-status
%reldir%/libprogram-commons.la \
lib/libgnu.la \
src/libtarot/libtarot.la \
$(LTLIBINTL) \
$(LTLIBTHREAD) \
@INTL_MACOSX_LIBS@
$(AM_LDADD)
INDENTED += %reldir%/tarot_status.c
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment