diff options
| author | Guenter Knauf <lists@gknw.net> | 2010-07-29 03:50:09 +0200 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2010-07-29 03:50:09 +0200 |
| commit | 6ad0acb608f6a6c56a5db1123cf9289df76b6f44 (patch) | |
| tree | 019e2300565119ad70617547dc974d826cef60ea | |
| parent | cfbb351e22a9f3d3a99317895975d368a1eedf31 (diff) | |
| download | curl-6ad0acb608f6a6c56a5db1123cf9289df76b6f44.tar.gz | |
Make Watcom makefiles use Makefile.inc to reduce future maintainance.
lib/Makefile.Watcom works fine already, for src/Makefile.Watcom we
need first to tweak src/Makefile.inc a bit - therefore the handtweaked
list still exists for now.
| -rw-r--r-- | Makefile.dist | 18 | ||||
| -rw-r--r-- | lib/Makefile.Watcom | 22 | ||||
| -rw-r--r-- | src/Makefile.Watcom | 6 |
3 files changed, 24 insertions, 22 deletions
diff --git a/Makefile.dist b/Makefile.dist index efcf9e1a4..f9f6b5fbe 100644 --- a/Makefile.dist +++ b/Makefile.dist @@ -54,17 +54,23 @@ borland-clean: cd ..\src make -f Makefile.b32 clean -watcom: +watcom: .SYMBOLIC cd lib - wmake -f Makefile.Watcom + wmake -u -f Makefile.Watcom cd ..\src - wmake -f Makefile.Watcom + wmake -u -f Makefile.Watcom -watcom-clean: +watcom-clean: .SYMBOLIC cd lib - wmake -f Makefile.Watcom clean + wmake -u -f Makefile.Watcom clean cd ..\src - wmake -f Makefile.Watcom clean + wmake -u -f Makefile.Watcom clean + +watcom-vclean: .SYMBOLIC + cd lib + wmake -u -f Makefile.Watcom vclean + cd ..\src + wmake -u -f Makefile.Watcom vclean mingw32: $(MAKE) -C lib -f Makefile.m32 diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index becdc5741..f590f416f 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -76,22 +76,12 @@ OBJ_BASE = WC_Win32.obj LINK_ARG = $(OBJ_BASE)\dyn\wlink.arg LIB_ARG = $(OBJ_BASE)\stat\wlib.arg -# Unfortunately, we can't include Makefile.inc here because wmake doesn't -# use backslash as the line continuation character by default -CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c & - cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c & - ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c & - netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c & - curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c & - krb5.c memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c & - multi.c content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c & - http_negotiate.c http_ntlm.c inet_pton.c strtoofft.c strerror.c & - hostares.c hostasyn.c hostip4.c hostip6.c hostsyn.c hostthre.c & - inet_ntop.c parsedate.c select.c gtls.c sslgen.c tftp.c splay.c & - strdup.c socks.c ssh.c nss.c qssl.c rawstr.c curl_addrinfo.c & - socks_gssapi.c socks_sspi.c curl_sspi.c slist.c nonblock.c & - curl_memrchr.c imap.c pop3.c smtp.c pingpong.c rtsp.c curl_threads.c & - warnless.c hmac.c polarssl.c curl_rtmp.c openldap.c +# In order to process Makefile.inc wmake must be called with -u switch! +!ifneq __MAKEOPTS__ -u +!error You MUST call wmake with the -u switch! +!else +!include Makefile.inc +!endif OBJS = $(CSOURCES:.c=.obj) OBJS = $OBJ_DIR\$(OBJS: = $OBJ_DIR\) diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index cae281e67..39a387ef7 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -47,6 +47,12 @@ CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6 OBJ_DIR = WC_Win32.obj LINK_ARG = $(OBJ_DIR)\wlink.arg +# In order to process Makefile.inc wmake must be called with -u switch! +!ifneq __MAKEOPTS__ -u +!error You MUST call wmake with the -u switch! +!else +!include Makefile.inc +!endif # Unfortunately, we can't include Makefile.inc here because wmake doesn't # use backslash as the line continuation character by default CURL_SOURCES = main.c hugehelp.c urlglob.c writeout.c writeenv.c & |