From b3205dfeebbda966ace2ca7eef5431c708c693bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sat, 16 Mar 2013 15:28:11 +0100
Subject: [PATCH] Makefiles: Added a few more @EXEEXT@s.
Hopefully the generated Makefiles should now be viable on OS/2.
Thanks to Chris Angelico <rosuav@gmail.com> for the reminder.
---
src/Makefile.in | 14 +++++++-------
src/configure.in | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
index 14f9a7b7f1..f0fa965202 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -421,18 +421,18 @@ gcov:
# purify
pure: $(OBJ) master-stamp module_objects
- -@mv pike pike.old 2>/dev/null || true
- $(SMARTLINK) purify -max-threads=128 -thread_stack_change=8192 -free-queue-length=500 -inuse-at-exit=yes -chain-length=12 $(REALCC) $(LDFLAGS) $(OBJ) `cat modules/linker_options @STATIC_POST_MODULES_LINKOPTS@` $(LIBS) -o pike
+ -@mv pike@EXEEXT@ pike.old@EXEEXT@ 2>/dev/null || true
+ $(SMARTLINK) purify -max-threads=128 -thread_stack_change=8192 -free-queue-length=500 -inuse-at-exit=yes -chain-length=12 $(REALCC) $(LDFLAGS) $(OBJ) `cat modules/linker_options @STATIC_POST_MODULES_LINKOPTS@` $(LIBS) -o pike@EXEEXT@
# purecov
cover: $(OBJ) master-stamp module_objects
- -@mv pike pike.old 2>/dev/null || true
- $(SMARTLINK) purecov purify -max-threads=128 -thread_stack_change=8192 -free-queue-length=500 -inuse-at-exit=yes -chain-length=12 $(REALCC) $(LDFLAGS) $(OBJ) `cat modules/linker_options @STATIC_POST_MODULES_LINKOPTS@` $(LIBS) -o pike
+ -@mv pike@EXEEXT@ pike.old@EXEEXT@ 2>/dev/null || true
+ $(SMARTLINK) purecov purify -max-threads=128 -thread_stack_change=8192 -free-queue-length=500 -inuse-at-exit=yes -chain-length=12 $(REALCC) $(LDFLAGS) $(OBJ) `cat modules/linker_options @STATIC_POST_MODULES_LINKOPTS@` $(LIBS) -o pike@EXEEXT@
# quantify
quant: $(OBJ) master-stamp module_objects
- -@mv pike pike.old 2>/dev/null || true
- $(SMARTLINK) quantify $(REALCC) $(LDFLAGS) $(OBJ) `cat modules/linker_options @STATIC_POST_MODULES_LINKOPTS@` $(LIBS) -o pike
+ -@mv pike@EXEEXT@ pike.old@EXEEXT@ 2>/dev/null || true
+ $(SMARTLINK) quantify $(REALCC) $(LDFLAGS) $(OBJ) `cat modules/linker_options @STATIC_POST_MODULES_LINKOPTS@` $(LIBS) -o pike@EXEEXT@
splint:
splint $(PREFLAGS) -warnposix +charintliteral -realcompare -boolops -predboolint $(FILE)
@@ -1166,7 +1166,7 @@ depend: $(SRC_TARGETS)
post_modules_depend:
@if [ "x$(RUNPIKE)" != "x$(DEFAULT_RUNPIKE)" -o -x $(TMP_BUILDDIR)/pike ]; then :; \
- else $(MAKE) $(MAKE_FLAGS) $(MAKE_PARALLEL) pike; fi
+ else $(MAKE) $(MAKE_FLAGS) $(MAKE_PARALLEL) pike@EXEEXT@; fi
@( cd post_modules && { \
rm -f remake; \
$(MAKE) $(MAKE_FLAGS) depend || \
diff --git a/src/configure.in b/src/configure.in
index 647b4a076f..b37b3061ec 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -8534,14 +8534,14 @@ if test x$with_dynamic_modules = xyes ; then
CCSHARED="${CCSHARED} ${DYNAMIC_MODULE_FLAGS}"
PIKE_LIB="libpike.so"
MODULE_O=tmodule.o
- BUILD_PIKE=pike
+ BUILD_PIKE=pike$EXEEXT
POST_MODULE_BUILD_TYPE=dynamic
STATIC_POST_MODULES_LINKOPTS=
else
dmmsrc="modules/static_module_makefile.in"
PIKE_LIB="libpike.a"
MODULE_O=module.o
- BUILD_PIKE=tpike
+ BUILD_PIKE=tpike$EXEEXT
POST_MODULE_BUILD_TYPE=static
STATIC_POST_MODULES_LINKOPTS=post_modules/linker_options
DYNAMIC_MODULE_FLAGS=""
--
GitLab