From d884a97c024966a53335b9d2e2931a5413e2a6fe Mon Sep 17 00:00:00 2001 From: lohhiiccc <96543753+lohhiiccc@users.noreply.github.com> Date: Wed, 22 Apr 2026 23:22:32 +0200 Subject: [PATCH] build: extract libping_core as noinst library --- src/ping/Makefile.am | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/ping/Makefile.am b/src/ping/Makefile.am index 6bc457b..0d954f6 100644 --- a/src/ping/Makefile.am +++ b/src/ping/Makefile.am @@ -1,4 +1,5 @@ bin_PROGRAMS = ft_ping +noinst_LTLIBRARIES = libping_core.la PING_VERSION = 0.0.1 VERSION_HEADER = $(top_srcdir)/includes/version_gen.h @@ -40,8 +41,7 @@ $(VERSION_HEADER): FORCE FORCE: .PHONY: FORCE -ft_ping_SOURCES = \ - main.c \ +libping_core_la_SOURCES = \ cli/parse.c \ cli/handlers/handle_count.c \ cli/handlers/handle_dont_fragment.c \ @@ -81,12 +81,6 @@ ft_ping_SOURCES = \ stats/stats_init.c \ stats/stats_update.c -ft_ping_CPPFLAGS = \ - -I $(top_srcdir)/includes \ - -I $(top_srcdir)/libicmp/includes \ - -I $(top_srcdir)/libcli/include \ - -D_GNU_SOURCE - BASE_CFLAGS = -std=c99 $(STRICT_CFLAGS) if ENABLE_DEBUG @@ -101,13 +95,27 @@ else SANITIZER_FLAGS = endif -ft_ping_CFLAGS = $(BASE_CFLAGS) $(EXTRA_CFLAGS) $(SANITIZER_FLAGS) -ft_ping_LDFLAGS = $(SANITIZER_FLAGS) -ft_ping_LDADD = \ +PING_CPPFLAGS = \ + -I $(top_srcdir)/includes \ + -I $(top_srcdir)/libicmp/includes \ + -I $(top_srcdir)/libcli/include \ + -D_GNU_SOURCE + +PING_CFLAGS = $(BASE_CFLAGS) $(EXTRA_CFLAGS) $(SANITIZER_FLAGS) + +libping_core_la_CPPFLAGS = $(PING_CPPFLAGS) +libping_core_la_CFLAGS = $(PING_CFLAGS) + +ft_ping_SOURCES = main.c +ft_ping_CPPFLAGS = $(PING_CPPFLAGS) +ft_ping_CFLAGS = $(PING_CFLAGS) +ft_ping_LDFLAGS = $(SANITIZER_FLAGS) +ft_ping_LDADD = \ + libping_core.la \ $(top_srcdir)/libicmp/libicmp.a \ $(top_builddir)/libcli/src/libcli.la \ -lm # Build libicmp (simple Makefile) before linking -$(top_srcdir)/libicmp/libicmp.a: +$(top_srcdir)/libicmp/libicmp.a: FORCE $(MAKE) -C $(top_srcdir)/libicmp BUILD_STATIC=yes BUILD_SHARED=no