Commit 6ad0acb6 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

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.
parent cfbb351e

Makefile.dist

+12 −6
Original line number Diff line number Diff line
@@ -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

lib/Makefile.Watcom

+6 −16
Original line number Diff line number Diff line
@@ -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\)

src/Makefile.Watcom

+6 −0
Original line number Diff line number Diff line
@@ -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 &