summaryrefslogtreecommitdiff
path: root/src/Makefile.Watcom
diff options
context:
space:
mode:
authorGuenter Knauf <lists@gknw.net>2010-08-06 03:42:18 +0200
committerGuenter Knauf <lists@gknw.net>2010-08-06 03:46:34 +0200
commit9df82573016eb964a81c656f22263ff9f960974e (patch)
tree8d8cb16e3c1566f4bee15abc2a80cafb95faab42 /src/Makefile.Watcom
parent992ceae386cc9452d5961c20e1ce23e57260fed2 (diff)
downloadcurl-9df82573016eb964a81c656f22263ff9f960974e.tar.gz
Some more Watcom makefile massage ...
For now removed the .autodepend directive until I've figured out which of my changes broke it again.
Diffstat (limited to 'src/Makefile.Watcom')
-rw-r--r--src/Makefile.Watcom42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 1ab1aa569..05972bcb0 100644
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -84,6 +84,14 @@ RESOURCE = $(OBJ_DIR)\curl.res
all: hugehelp.c $(OBJ_DIR) curl.exe .SYMBOLIC
@echo Welcome to cURL
+clean: .SYMBOLIC
+ -$(RM) $(OBJS)
+ -$(RM) $(RESOURCE) $(LINK_ARG)
+
+vclean realclean: clean .SYMBOLIC
+ -$(RD) $(OBJ_DIR)
+ -$(RM) curl.exe curl.map hugehelp.c
+
hugehelp.c: hugehelp.c.cvs
$(CP) $[@ $^@
@@ -94,7 +102,17 @@ $(OBJ_DIR):
-$(MD) $^@
curl.exe: $(OBJS) $(RESOURCE) $(LINK_ARG)
- $(LD) name $^@ @$(LINK_ARG)
+ $(LD) name $^@ @$]@
+
+$(RESOURCE): curl.rc
+ $(RC) $(DEBUG) -q -r -zm -I..\include $(SYS_INCL) $[@ -fo=$^@
+
+# suffix search path - vpath-like hack
+.c: ..\lib
+
+.ERASE
+.c{$(OBJ_DIR)}.obj:
+ $(CC) $(CFLAGS) $[@ -fo=$^@
$(LINK_ARG): $(__MAKEFILES__)
%create $^@
@@ -105,7 +123,7 @@ $(LINK_ARG): $(__MAKEFILES__)
# @%append $^@ library clib3r.lib
!ifdef %curl_static
@%append $^@ library wldap32.lib
- @%append $^@ library ..\lib\libcurl_wc.lib
+ @%append $^@ library ..\lib\libcurl.lib
!ifdef %use_zlib
@%append $^@ library $(ZLIB_ROOT)\zlib.lib
!endif
@@ -113,7 +131,7 @@ $(LINK_ARG): $(__MAKEFILES__)
@%append $^@ library $(ARES_ROOT)\cares.lib
!endif
!else
- @%append $^@ library ..\lib\libcurl_wc_imp.lib
+ @%append $^@ library ..\lib\libcurl_imp.lib
!endif
!ifeq USE_WATT32 1
@%append $^@ library $(%watt_root)\lib\wattcpw_imp.lib
@@ -121,21 +139,3 @@ $(LINK_ARG): $(__MAKEFILES__)
@%append $^@ library ws2_32.lib
!endif
-clean: .SYMBOLIC
- -$(RM) $(OBJS)
- -$(RM) $(RESOURCE) $(LINK_ARG)
-
-vclean realclean: clean .SYMBOLIC
- -$(RD) $(OBJ_DIR)
- -$(RM) curl.exe curl.map hugehelp.c
-
-$(RESOURCE): curl.rc
- $(RC) $(DEBUG) -q -r -zm -I..\include $(SYS_INCL) $[@ -fo=$^@
-
-# suffix search path - vpath-like hack
-.c: ..\lib
-
-.ERASE
-.c{$(OBJ_DIR)}.obj: .AUTODEPEND
- $(CC) $(CFLAGS) $[@ -fo=$^@
-