moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

build: Updated all makefiles and project files for the new vauth directory

Browse Source 
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.
This commit is contained in:
Steve Holme 2015-09-12 11:14:14 +01:00
parent f8d88a4913
commit dc72f8df0c
15 changed files with 116 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Makefile.am
View File

@ -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; }; \

9
lib/Makefile.Watcom
View File

@ -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

9
lib/Makefile.b32
View File

@ -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

2
lib/Makefile.netware
View File

@ -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

3
lib/Makefile.vc6
View File

@ -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"$@" $<

2
projects/Windows/VC10/lib/libcurl.tmpl
View File

@ -2324,10 +2324,12 @@
</ItemDefinitionGroup>
<ItemGroup>
CURL_LIB_C_FILES
CURL_LIB_VAUTH_C_FILES
CURL_LIB_VTLS_C_FILES
</ItemGroup>
<ItemGroup>
CURL_LIB_H_FILES
CURL_LIB_VAUTH_H_FILES
CURL_LIB_VTLS_H_FILES
</ItemGroup>
<ItemGroup>

2
projects/Windows/VC11/lib/libcurl.tmpl
View File

@ -2380,10 +2380,12 @@
</ItemDefinitionGroup>
<ItemGroup>
CURL_LIB_C_FILES
CURL_LIB_VAUTH_C_FILES
CURL_LIB_VTLS_C_FILES
</ItemGroup>
<ItemGroup>
CURL_LIB_H_FILES
CURL_LIB_VAUTH_H_FILES
CURL_LIB_VTLS_H_FILES
</ItemGroup>
<ItemGroup>

2
projects/Windows/VC12/lib/libcurl.tmpl
View File

@ -2380,10 +2380,12 @@
</ItemDefinitionGroup>
<ItemGroup>
CURL_LIB_C_FILES
CURL_LIB_VAUTH_C_FILES
CURL_LIB_VTLS_C_FILES
</ItemGroup>
<ItemGroup>
CURL_LIB_H_FILES
CURL_LIB_VAUTH_H_FILES
CURL_LIB_VTLS_H_FILES
</ItemGroup>
<ItemGroup>

2
projects/Windows/VC14/lib/libcurl.tmpl
View File

@ -2380,10 +2380,12 @@
</ItemDefinitionGroup>
<ItemGroup>
CURL_LIB_C_FILES
CURL_LIB_VAUTH_C_FILES
CURL_LIB_VTLS_C_FILES
</ItemGroup>
<ItemGroup>
CURL_LIB_H_FILES
CURL_LIB_VAUTH_H_FILES
CURL_LIB_VTLS_H_FILES
</ItemGroup>
<ItemGroup>

2
projects/Windows/VC6/lib/libcurl.tmpl
View File

@ -729,12 +729,14 @@ LIB32=link.exe -lib
# PROP Default_Filter ""
CURL_LIB_C_FILES
CURL_LIB_VAUTH_C_FILES
CURL_LIB_VTLS_C_FILES
# End Group
# Begin Group "Header Files"
# PROP Default_Filter ""
CURL_LIB_H_FILES
CURL_LIB_VAUTH_H_FILES
CURL_LIB_VTLS_H_FILES
# End Group
# Begin Group "Resource Files"

14
projects/Windows/VC7.1/lib/libcurl.tmpl
View File

@ -1267,6 +1267,20 @@ CURL_LIB_H_FILES
Filter="">
CURL_LIB_RC_FILES
</Filter>
<Filter
Name="vauth"
Filter="">
<Filter
Name="Source Files"
Filter="">
CURL_LIB_VAUTH_C_FILES
</Filter>
<Filter
Name="Header Files"
Filter="">
CURL_LIB_VAUTH_H_FILES
</Filter>
</Filter>
<Filter
Name="vtls"
Filter="">

14
projects/Windows/VC7/lib/libcurl.tmpl
View File

@ -1121,6 +1121,20 @@ CURL_LIB_H_FILES
Filter="">
CURL_LIB_RC_FILES
</Filter>
<Filter
Name="vauth"
Filter="">
<Filter
Name="Source Files"
Filter="">
CURL_LIB_VAUTH_C_FILES
</Filter>
<Filter
Name="Header Files"
Filter="">
CURL_LIB_VAUTH_H_FILES
</Filter>
</Filter>
<Filter
Name="vtls"
Filter="">

14
projects/Windows/VC8/lib/libcurl.tmpl
View File

@ -3628,6 +3628,20 @@ CURL_LIB_H_FILES
>
CURL_LIB_RC_FILES
</Filter>
<Filter
Name="vauth"
>
<Filter
Name="Source Files"
>
CURL_LIB_VAUTH_C_FILES
</Filter>
<Filter
Name="Header Files"
>
CURL_LIB_VAUTH_H_FILES
</Filter>
</Filter>
<Filter
Name="vtls"
>

14
projects/Windows/VC9/lib/libcurl.tmpl
View File

@ -3569,6 +3569,20 @@ CURL_LIB_H_FILES
>
CURL_LIB_RC_FILES
</Filter>
<Filter
Name="vauth"
>
<Filter
Name="Source Files"
>
CURL_LIB_VAUTH_C_FILES
</Filter>
<Filter
Name="Header Files"
>
CURL_LIB_VAUTH_H_FILES
</Filter>
</Filter>
<Filter
Name="vtls"
>

4
winbuild/MakefileBuild.vc
View File

@ -436,6 +436,7 @@ $(DIRDIST):
$(LIB_DIROBJ):
@if not exist "$(LIB_DIROBJ)" mkdir $(LIB_DIROBJ)
@if not exist "$(LIB_DIROBJ)\vauth" mkdir $(LIB_DIROBJ)\vauth
@if not exist "$(LIB_DIROBJ)\vtls" mkdir $(LIB_DIROBJ)\vtls
$(CURL_DIROBJ):
@ -449,6 +450,9 @@ $(CURL_DIROBJ):
{$(LIBCURL_SRC_DIR)\}.c{$(LIB_DIROBJ)\}.obj:
$(CC) $(CFLAGS) /Fo"$@" $<
{$(LIBCURL_SRC_DIR)\vauth\}.c{$(LIB_DIROBJ)\vauth\}.obj:
$(CC) $(CFLAGS) /Fo"$@" $<
{$(LIBCURL_SRC_DIR)\vtls\}.c{$(LIB_DIROBJ)\vtls\}.obj:
$(CC) $(CFLAGS) /Fo"$@" $<