From 495d3e07d441e8c50fb930bd3b5fe5cda7ca63a8 Mon Sep 17 00:00:00 2001
From: Guenter Knauf <lists@gknw.net>
Date: Tue, 10 Aug 2010 17:29:06 +0200
Subject: [PATCH] More Watcom makefile fixes.
Added the -br switch to dynamic builds which fixes the issue I saw
with curl's --version output. Added debug info and symfile for debug
builds to linker opts. Added DLL loader for wlink back, but this time
dependend on wlink version.
Patch posted to the list by malak.jiri AT gmail.com.
---
lib/Makefile.Watcom | 14 +++++++++++---
src/Makefile.Watcom | 13 +++++++++++--
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index 07f2a2d9a7..e74ab0f36c 100644
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -26,6 +26,11 @@ RC = wrc
! loaddll wcc386 wccd386
! loaddll wpp386 wppd386
! loaddll wlib wlibd
+! if $(__VERSION__) < 1280
+! loaddll wlink wlinkd
+! else
+! loaddll wlink wlink
+! endif
!endif
MD = mkdir
@@ -110,7 +115,7 @@ clean: .SYMBOLIC
-$(RM) $(RESOURCE) $(LINK_ARG) $(LIB_ARG)
vclean realclean: clean .SYMBOLIC
- -$(RM) $(TARGETS) $(LIBNAME).map
+ -$(RM) $(TARGETS) $(LIBNAME).map $(LIBNAME).sym
-$(RD) $(OBJ_BASE)\stat
-$(RD) $(OBJ_BASE)\dyn
-$(RD) $(OBJ_BASE)
@@ -135,7 +140,7 @@ $(RESOURCE): libcurl.rc
.ERASE
.c{$(OBJ_BASE)\dyn}.obj:
- $(CC) $(CFLAGS) -bd $[@ -fo=$^@
+ $(CC) $(CFLAGS) -bd -br $[@ -fo=$^@
.ERASE
.c{$(OBJ_BASE)\stat}.obj:
@@ -145,9 +150,12 @@ $(LINK_ARG): $(__MAKEFILES__)
%create $^@
@%append $^@ system nt dll
@%append $^@ file { $(OBJS_DYN) }
+!ifdef %debug
+ @%append $^@ debug all
+ @%append $^@ option symfile
+!endif
@%append $^@ option quiet, map, caseexact, eliminate, implib=$(LIBNAME)_imp.lib,
@%append $^@ res=$(RESOURCE) libpath $(SYS_LIBS)
-# @%append $^@ library clib3r.lib
@%append $^@ library wldap32.lib
!ifdef %use_watt32
@%append $^@ library $(%watt_root)\lib\wattcpw_imp.lib
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 9fa3ab4a0c..1f67cbc919 100644
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -26,6 +26,11 @@ RC = wrc
! loaddll wcc386 wccd386
! loaddll wpp386 wppd386
! loaddll wlib wlibd
+! if $(__VERSION__) < 1280
+! loaddll wlink wlinkd
+! else
+! loaddll wlink wlink
+! endif
!endif
MD = mkdir
@@ -80,6 +85,7 @@ OBJS = $(CURL_CFILES:.c=.obj)
!ifdef %curl_static
CFLAGS += -DCURL_STATICLIB
!else
+CFLAGS += -br
OBJS += $(CURLX_SOURCES:.c=.obj)
!endif
OBJS = $OBJ_DIR\$(OBJS: = $OBJ_DIR\)
@@ -95,7 +101,7 @@ clean: .SYMBOLIC
vclean realclean: clean .SYMBOLIC
-$(RD) $(OBJ_DIR)
- -$(RM) curl.exe curl.map hugehelp.c
+ -$(RM) curl.exe curl.map curl.sym hugehelp.c
hugehelp.c: hugehelp.c.cvs
$(CP) $[@ $^@
@@ -123,9 +129,12 @@ $(LINK_ARG): $(__MAKEFILES__)
%create $^@
@%append $^@ system nt
@%append $^@ file { $(OBJS) }
+!ifdef %debug
+ @%append $^@ debug all
+ @%append $^@ option symfile
+!endif
@%append $^@ option quiet, map, caseexact, eliminate,
@%append $^@ res=$(RESOURCE) libpath $(SYS_LIBS)
-# @%append $^@ library clib3r.lib
!ifdef %curl_static
@%append $^@ library wldap32.lib
@%append $^@ library ..\lib\$(LIBNAME).lib
--
GitLab