diff options
| author | Gunter Knauf <gk@gknw.de> | 2004-07-05 13:25:30 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2004-07-05 13:25:30 +0000 |
| commit | 954575a19d7fc8d46998b2dd2c5b01aacc73448d (patch) | |
| tree | 741df28c384ed9e95e313be2bcd954987d689d79 /src | |
| parent | 47bbe36725cc3723087d128b24f34c2ad77c0d31 (diff) | |
changed to use Makefile.inc; made paths overwritable.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.m32 | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/Makefile.m32 b/src/Makefile.m32 index f5eb1fee0..517faae07 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -9,11 +9,16 @@ ## Comments to: Troy Engel <tengel@sonic.net> or ## Joern Hartroth <hartroth@acm.org> +ifndef OPENSSL_PATH +OPENSSL_PATH = ../../openssl-0.9.7d +endif +ifndef ZLIB_PATH +ZLIB_PATH = ../../zlib-1.2.1 +endif + CC = gcc RM = rm -f STRIP = strip -s -OPENSSL_PATH = ../../openssl-0.9.7d -ZLIB_PATH = ../../zlib-1.2.1 # We may need these someday # PERL = perl @@ -32,8 +37,6 @@ COMPILE = $(CC) $(INCLUDES) $(CFLAGS) LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ curl_PROGRAMS = curl.exe -curl_OBJECTS = main.o hugehelp.o urlglob.o writeout.o getpass.o homedir.o -curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c getpass.c homedir.c ifdef DYN curl_DEPENDENCIES = ../lib/libcurldll.a ../lib/libcurl.dll curl_LDADD = -L../lib -lcurldll @@ -46,9 +49,13 @@ ifdef SSL curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 endif -PROGRAMS = $(curl_PROGRAMS) -SOURCES = $(curl_SOURCES) -OBJECTS = $(curl_OBJECTS) +# Makefile.inc provides the CSOURCES and HHEADERS defines +include Makefile.inc + +curl_OBJECTS := $(patsubst %.c,%.o,$(strip $(CURL_SOURCES))) +# curlx_OBJECTS := $(patsubst %.c,%.o,$(notdir $(strip $(CURLX_ONES)))) +# vpath %.c ../lib + all: curl.exe |