>From 47ae215b21fef9dd6f6bc93a187cb1198892441e Mon Sep 17 00:00:00 2001 From: Darshit Shah Date: Tue, 5 May 2020 17:09:38 +0200 Subject: [PATCH 2/2] poke: Slight cleanup in Makefile 2020-05-05 Darshit Shah * poke/Makefile.am: Merge two ifdef blocks into one. (Purely cosmetic) --- ChangeLog | 4 ++++ poke/Makefile.am | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76ccedb..03663fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2020-05-05 Darshit Shah + * poke/Makefile.am: Merge two ifdef blocks into one. (Purely cosmetic) + +2020-05-05 Darshit Shah + * m4/libtextstyle-hyperlink.m4: Use an action-if-true to prevent adding it to LIBS AC_SEARCH_LIBS will add the library to LIBS if action-if-true is empty. We prevent that by adding an action-if-true, and manually including diff --git a/poke/Makefile.am b/poke/Makefile.am index 0d3e823..35f3f5f 100644 --- a/poke/Makefile.am +++ b/poke/Makefile.am @@ -31,10 +31,6 @@ poke_SOURCES = poke.c poke.h \ pk-info.c pk-misc.c pk-help.c pk-vm.c \ pk-def.c pk-set.c pk-editor.c -if HSERVER - poke_SOURCES += pk-hserver.h pk-hserver.c -endif - poke_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl \ -I$(top_srcdir)/libutils -I$(top_builddir)/libutils \ -I$(top_srcdir)/libpoke -I$(top_builddir)/libpoke \ @@ -53,6 +49,7 @@ poke_LDADD = $(top_builddir)/gl/libgnu.la \ poke_LDFLAGS = if HSERVER + poke_SOURCES += pk-hserver.h pk-hserver.c poke_LDADD += -lpthread endif -- 1.8.3.1