Commit dc72f8df authored by Steve Holme's avatar Steve Holme
Browse files

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 0d04e859.
parent f8d88a49

Makefile.am

+32 −1
Original line number Diff line number Diff line
@@ -294,6 +294,8 @@ vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \ 
	@(win32_lib_srcs='$(LIB_CFILES)'; \

	win32_lib_hdrs='$(LIB_HFILES) config-win32.h'; \

	win32_lib_rc='$(LIB_RCFILES)'; \

	win32_lib_vauth_srcs='$(LIB_VAUTH_CFILES)'; \

	win32_lib_vauth_hdrs='$(LIB_VAUTH_HFILES)'; \

	win32_lib_vtls_srcs='$(LIB_VTLS_CFILES)'; \

	win32_lib_vtls_hdrs='$(LIB_VTLS_HFILES)'; \

	win32_src_srcs='$(CURL_CFILES)'; \
@@ -304,6 +306,8 @@ vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \ 
	\

	sorted_lib_srcs=`for file in $$win32_lib_srcs; do echo $$file; done | sort`; \

	sorted_lib_hdrs=`for file in $$win32_lib_hdrs; do echo $$file; done | sort`; \

	sorted_lib_vauth_srcs=`for file in $$win32_lib_vauth_srcs; do echo $$file; done | sort`; \

	sorted_lib_vauth_hdrs=`for file in $$win32_lib_vauth_hdrs; do echo $$file; done | sort`; \

	sorted_lib_vtls_srcs=`for file in $$win32_lib_vtls_srcs; do echo $$file; done | sort`; \

	sorted_lib_vtls_hdrs=`for file in $$win32_lib_vtls_hdrs; do echo $$file; done | sort`; \

	sorted_src_srcs=`for file in $$win32_src_srcs; do echo $$file; done | sort`; \
@@ -314,10 +318,11 @@ vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \ 
	awk_code='\

function gen_element(type, dir, file)\

{\

  sub(/vauth\//, "", file);\

  sub(/vtls\//, "", file);\

\

  spaces="    ";\

  if(dir == "lib\\vtls")\

  if(dir == "lib\\vauth" || dir == "lib\\vtls")\

    tabs="				";\

  else\

    tabs="			";\
@@ -371,6 +376,14 @@ function gen_element(type, dir, file)\ 
    split(lib_rc, arr);\

    for(val in arr) gen_element(proj_type, "lib", arr[val]);\

  }\

  else if($$0 == "CURL_LIB_VAUTH_C_FILES") {\

    split(lib_vauth_srcs, arr);\

    for(val in arr) gen_element(proj_type, "lib\\vauth", arr[val]);\

  }\

  else if($$0 == "CURL_LIB_VAUTH_H_FILES") {\

    split(lib_vauth_hdrs, arr);\

    for(val in arr) gen_element(proj_type, "lib\\vauth", arr[val]);\

  }\

  else if($$0 == "CURL_LIB_VTLS_C_FILES") {\

    split(lib_vtls_srcs, arr);\

    for(val in arr) gen_element(proj_type, "lib\\vtls", arr[val]);\
@@ -414,6 +427,8 @@ function gen_element(type, dir, file)\ 
		-v lib_srcs="$$sorted_lib_srcs" \

		-v lib_hdrs="$$sorted_lib_hdrs" \

		-v lib_rc="$$win32_lib_rc" \

		-v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \

		-v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \

		-v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \

		-v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \

		"$$awk_code" $(srcdir)/$(VC6_LIBTMPL) > $(VC6_LIBDSP) || { exit 1; }; \
@@ -432,6 +447,8 @@ function gen_element(type, dir, file)\ 
		-v lib_srcs="$$sorted_lib_srcs" \

		-v lib_hdrs="$$sorted_lib_hdrs" \

		-v lib_rc="$$win32_lib_rc" \

		-v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \

		-v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \

		-v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \

		-v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \

		"$$awk_code" $(srcdir)/$(VC7_LIBTMPL) > $(VC7_LIBVCPROJ) || { exit 1; }; \
@@ -450,6 +467,8 @@ function gen_element(type, dir, file)\ 
		-v lib_srcs="$$sorted_lib_srcs" \

		-v lib_hdrs="$$sorted_lib_hdrs" \

		-v lib_rc="$$win32_lib_rc" \

		-v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \

		-v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \

		-v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \

		-v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \

		"$$awk_code" $(srcdir)/$(VC71_LIBTMPL) > $(VC71_LIBVCPROJ) || { exit 1; }; \
@@ -468,6 +487,8 @@ function gen_element(type, dir, file)\ 
		-v lib_srcs="$$sorted_lib_srcs" \

		-v lib_hdrs="$$sorted_lib_hdrs" \

		-v lib_rc="$$win32_lib_rc" \

		-v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \

		-v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \

		-v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \

		-v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \

		"$$awk_code" $(srcdir)/$(VC8_LIBTMPL) > $(VC8_LIBVCPROJ) || { exit 1; }; \
@@ -486,6 +507,8 @@ function gen_element(type, dir, file)\ 
		-v lib_srcs="$$sorted_lib_srcs" \

		-v lib_hdrs="$$sorted_lib_hdrs" \

		-v lib_rc="$$win32_lib_rc" \

		-v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \

		-v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \

		-v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \

		-v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \

		"$$awk_code" $(srcdir)/$(VC9_LIBTMPL) > $(VC9_LIBVCPROJ) || { exit 1; }; \
@@ -504,6 +527,8 @@ function gen_element(type, dir, file)\ 
		-v lib_srcs="$$sorted_lib_srcs" \

		-v lib_hdrs="$$sorted_lib_hdrs" \

		-v lib_rc="$$win32_lib_rc" \

		-v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \

		-v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \

		-v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \

		-v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \

		"$$awk_code" $(srcdir)/$(VC10_LIBTMPL) > $(VC10_LIBVCXPROJ) || { exit 1; }; \
@@ -522,6 +547,8 @@ function gen_element(type, dir, file)\ 
		-v lib_srcs="$$sorted_lib_srcs" \

		-v lib_hdrs="$$sorted_lib_hdrs" \

		-v lib_rc="$$win32_lib_rc" \

		-v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \

		-v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \

		-v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \

		-v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \

		"$$awk_code" $(srcdir)/$(VC11_LIBTMPL) > $(VC11_LIBVCXPROJ) || { exit 1; }; \
@@ -540,6 +567,8 @@ function gen_element(type, dir, file)\ 
		-v lib_srcs="$$sorted_lib_srcs" \

		-v lib_hdrs="$$sorted_lib_hdrs" \

		-v lib_rc="$$win32_lib_rc" \

		-v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \

		-v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \

		-v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \

		-v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \

		"$$awk_code" $(srcdir)/$(VC12_LIBTMPL) > $(VC12_LIBVCXPROJ) || { exit 1; }; \
@@ -558,6 +587,8 @@ function gen_element(type, dir, file)\ 
		-v lib_srcs="$$sorted_lib_srcs" \

		-v lib_hdrs="$$sorted_lib_hdrs" \

		-v lib_rc="$$win32_lib_rc" \

		-v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \

		-v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \

		-v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \

		-v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \

		"$$awk_code" $(srcdir)/$(VC14_LIBTMPL) > $(VC14_LIBVCXPROJ) || { exit 1; }; \

lib/Makefile.Watcom

+5 −4
Original line number Diff line number Diff line
@@ -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

lib/Makefile.b32

+5 −4
Original line number Diff line number Diff line
@@ -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

lib/Makefile.netware

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

lib/Makefile.vc6

+3 −0
Original line number Diff line number Diff line
@@ -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"$@"  $<