From 928139d581ba3b90e87683e3948db61193498fc5 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Wed, 23 Feb 2022 23:20:34 -0500 Subject: [PATCH] Ditch local orderonly trick. The orderonly trick used here is missing various updates in fix-gnulib that improve interoperability with various make implementations. We can just rely on the logic in $(gnulib_headers) to get its version of the order-only behaviour, particularly since every file including these ones should have gnulib header dependencies. --- Makefile.am | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index d6d99b0..57d8142 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,10 +32,6 @@ include_HEADERS = dist_man_MANS = doc/man/upkg.1 -# This trick should define orderonly to | iff we're using GNU make. -have_orderonly = $(findstring order-only,$(.FEATURES)) -orderonly = $(have_orderonly:order-only=|) - upkg_SOURCES = src/upkg.c src/upkg.h src/upkgopts.h \ common/src/help.c common/src/help.h upkg_LDFLAGS = $(AM_LDFLAGS) -export-dynamic @@ -76,7 +72,7 @@ engine_la_SOURCES = $(engine_GOBS:.gob=.c) $(engine_GOBS:.gob=.h) \ src/engine/pcx.h engine_la_LDFLAGS = $(AM_LDFLAGS) $(moduleflags) engine_la_LIBADD = $(GLIB_LIBS) -$(engine_la_OBJECTS): $(orderonly) $(engine_GOBS:.gob=.gobstamp) +$(engine_la_OBJECTS): $(gnulib_headers) $(engine_GOBS:.gob=.gobstamp) if USE_DUMMYMOD engine_la_SOURCES += src/engine/music-dummymod.c -- 2.43.2