diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2015-09-12 11:14:14 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2016-03-25 09:11:59 +0000 |
| commit | dc72f8df0c914de688077f296bf94360cf928529 (patch) | |
| tree | 95746197b28475d80942ba3c2e6472457881b01e /lib | |
| parent | f8d88a491397a13f0e676bd0b2d0f275a728b860 (diff) | |
build: Updated all makefiles and project files for the new vauth directory
Updated the makefiles and Visual Studio project files to support moving
the authentication code to the new lib/vauth directory that was started
in commit 0d04e859e1.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.Watcom | 9 | ||||
| -rw-r--r-- | lib/Makefile.b32 | 9 | ||||
| -rw-r--r-- | lib/Makefile.netware | 2 | ||||
| -rw-r--r-- | lib/Makefile.vc6 | 3 |
4 files changed, 14 insertions, 9 deletions
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index b5928b842..cbc54cfc7 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -187,16 +187,17 @@ LIB_ARG = $(OBJ_STAT)/wlib.arg OBJS1 = ./$(CSOURCES:.c=.obj) OBJS2 = $(OBJS1:vtls/=) -OBJS3 = $(OBJS2: = ./) -OBJS_STAT = $(OBJS3:./=$(OBJ_STAT)/) -OBJS_DYN = $(OBJS3:./=$(OBJ_DYN)/) +OBJS3 = $(OBJS2:vauth/=) +OBJS4 = $(OBJS3: = ./) +OBJS_STAT = $(OBJS4:./=$(OBJ_STAT)/) +OBJS_DYN = $(OBJS4:./=$(OBJ_DYN)/) CURLBUILDH = ../include/curl/curlbuild.h RESOURCE = $(OBJ_DYN)/libcurl.res DIRS = $(OBJ_BASE) $(OBJ_BASE)/stat $(OBJ_BASE)/dyn -.c : vtls +.c : vauth vtls all: $(CURLBUILDH) $(DIRS) $(TARGETS) .SYMBOLIC @echo Welcome to libcurl diff --git a/lib/Makefile.b32 b/lib/Makefile.b32 index 1914a9410..481386157 100644 --- a/lib/Makefile.b32 +++ b/lib/Makefile.b32 @@ -69,7 +69,7 @@ CC_FLAGS = -5 -O2 -tWM -w -w-aus -w-ccc -w-dup -w-prc -w-pro -w-rch -w-sig -w-sp LIBFLAGS = /C /P32 LDFLAGS = -q -lq -laa -tWD -SRCDIR = .;.\vtls +SRCDIR = .;.\vauth;.\vtls OBJDIR = .\BCC_objs INCDIRS = -I.;.\lib;..\include LINKLIB = $(BCCDIR)\lib\cw32mt.lib $(BCCDIR)\lib\ws2_32.lib @@ -115,10 +115,11 @@ LINKLIB = $(LINKLIB) $(OPENSSL_PATH)\out32\ssleay32.lib $(OPENSSL_PATH)\out32\l # using explicit compilation build rules instead of implicit ones. NOHYPHEN1 = $(CSOURCES:-=_) -NOHYPHEN2 = $(NOHYPHEN1:vtls/=) +NOHYPHEN2 = $(NOHYPHEN1:vauth/=) +NOHYPHEN3 = $(NOHYPHEN2:vtls/=) -OBJECTS = $(NOHYPHEN2:.c=.obj) -PREPROCESSED = $(NOHYPHEN2:.c=.int) +OBJECTS = $(NOHYPHEN3:.c=.obj) +PREPROCESSED = $(NOHYPHEN3:.c=.int) # Borland's command line compiler (BCC32) version 5.5.1 integrated # preprocessor has a bug which results in silently generating wrong diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 789670fb4..ee7e87ce7 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -351,7 +351,7 @@ OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(notdir $(CSOURCES)))) $(OBJDIR)/n OBJL = $(OBJS) $(OBJDIR)/nwlib.o $(LDLIBS) -vpath %.c . vtls +vpath %.c . vauth vtls all: lib nlm diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index ba903c9db..18079f7c5 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -660,6 +660,9 @@ $(DIROBJ): {.\}.c{$(DIROBJ)\}.obj:
$(CC) $(CFLAGS) /Fo"$@" $<
+{.\vauth\}.c{$(DIROBJ)\}.obj:
+ $(CC) $(CFLAGS) /Fo"$@" $<
+
{.\vtls\}.c{$(DIROBJ)\}.obj:
$(CC) $(CFLAGS) /Fo"$@" $<
|