From: Thibault Godouet <yo8192@users.noreply.github.com>
Date: Sun, 20 Apr 2025 08:30:28 +0000 (+0100)
Subject: Fixed building tests from directory other than source dir.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f30b0efe5b62719b7f878c148f79ba2aff5cec6f;p=thirdparty%2Ffcron.git

Fixed building tests from directory other than source dir.
---

diff --git a/Makefile.in b/Makefile.in
index ade2fb6..1f69176 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -123,10 +123,24 @@ fcronsighup: $(OBJSIG)
 convert-fcrontab: $(OBJCONV)
 	$(CC) $(CFLAGS) -o $@ $(OBJCONV) $(LIBS)
 
+%.o: $(SRCDIR)/%.c $(HEADERSALL) $(SRCDIR)/%.h
+	$(CC) $(CFLAGS) -DPIDFILE="\"${PIDFILE}\"" -DREBOOT_LOCK="\"${REBOOT_LOCK}\"" \
+	-DSUSPEND_FILE="\"${SUSPEND_FILE}\"" -DFIFOFILE="\"${FIFOFILE}\"" -DETC="\"${ETC}\"" \
+	-DFCRON_SHELL="\"${FCRON_SHELL}\"" -DFCRON_CONF="\"${FCRON_CONF}\"" \
+	-DFCRONTABS="\"${FCRONTABS}\"" \
+	-DFCRON_ALLOW="\"${FCRON_ALLOW}\"" -DFCRON_DENY="\"${FCRON_DENY}\"" \
+	-DFCRON_SHELL="\"${FCRON_SHELL}\"" -DSENDMAIL="\"${SENDMAIL}\"" \
+	-DFCRON_EDITOR="\"${FCRON_EDITOR}\"" \-DMAILDISPLAYNAME="\"${MAILDISPLAYNAME}\"" -DBINDIREX="\"${DESTBIN}\"" \
+	-c $<
+
+# All for main() to be replaced by cmocka:
 $(TESTS_DIR)/%.test.o: %.o
-	# All for main() to be replaced by cmocka:
+	@mkdir -p $(TESTS_DIR)/
 	objcopy $< --globalize-symbol=main --weaken-symbol=main $@
 
+$(TESTS_DIR)/%.o: $(SRCDIR)/$(TESTS_DIR)/%.c
+	$(CC) $(CFLAGS) -o $@ -c $< -Wno-implicit-function-declaration -Wno-unused-variable
+
 $(TESTS_DIR)/fcrondyn_svr_test: $(OBJSD_NO_MAIN) $(TESTS_DIR)/fcron.test.o $(TESTS_DIR)/fcrondyn_svr_test.o
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -lcmocka -Wno-implicit-function-declaration -Wl,--wrap=send
 	$@
@@ -141,19 +155,6 @@ $(TESTS_DIR)/mail_test: $(OBJSD_NO_MAIN) $(TESTS_DIR)/fcron.test.o $(TESTS_DIR)/
 
 tests: $(TESTS)
 
-$(TESTS_DIR)/%.o: $(TESTS_DIR)/%.c
-	$(CC) $(CFLAGS) -o $@ -c $< -Wno-implicit-function-declaration -Wno-unused-variable
-
-%.o: $(SRCDIR)/%.c $(HEADERSALL) $(SRCDIR)/%.h
-	$(CC) $(CFLAGS) -DPIDFILE="\"${PIDFILE}\"" -DREBOOT_LOCK="\"${REBOOT_LOCK}\"" \
-	-DSUSPEND_FILE="\"${SUSPEND_FILE}\"" -DFIFOFILE="\"${FIFOFILE}\"" -DETC="\"${ETC}\"" \
-	-DFCRON_SHELL="\"${FCRON_SHELL}\"" -DFCRON_CONF="\"${FCRON_CONF}\"" \
-	-DFCRONTABS="\"${FCRONTABS}\"" \
-	-DFCRON_ALLOW="\"${FCRON_ALLOW}\"" -DFCRON_DENY="\"${FCRON_DENY}\"" \
-	-DFCRON_SHELL="\"${FCRON_SHELL}\"" -DSENDMAIL="\"${SENDMAIL}\"" \
-	-DFCRON_EDITOR="\"${FCRON_EDITOR}\"" \-DMAILDISPLAYNAME="\"${MAILDISPLAYNAME}\"" -DBINDIREX="\"${DESTBIN}\"" \
-	-c $<
-
 initscripts:
 	@(if test ! -d script; then mkdir script ; fi ; \
 		for F in sysVinit-launcher fcron.sh fcron.init.suse fcron.init.systemd fcron.init.systemd.reboot fcron.suspend.sh ; do \