]> granicus.if.org Git - curl/commitdiff
build: Updated all makefiles and project files for the new vauth directory
authorSteve Holme <steve_holme@hotmail.com>
Sat, 12 Sep 2015 10:14:14 +0000 (11:14 +0100)
committerSteve Holme <steve_holme@hotmail.com>
Fri, 25 Mar 2016 09:11:59 +0000 (09:11 +0000)
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.

15 files changed:
Makefile.am
lib/Makefile.Watcom
lib/Makefile.b32
lib/Makefile.netware
lib/Makefile.vc6
projects/Windows/VC10/lib/libcurl.tmpl
projects/Windows/VC11/lib/libcurl.tmpl
projects/Windows/VC12/lib/libcurl.tmpl
projects/Windows/VC14/lib/libcurl.tmpl
projects/Windows/VC6/lib/libcurl.tmpl
projects/Windows/VC7.1/lib/libcurl.tmpl
projects/Windows/VC7/lib/libcurl.tmpl
projects/Windows/VC8/lib/libcurl.tmpl
projects/Windows/VC9/lib/libcurl.tmpl
winbuild/MakefileBuild.vc

index 61cc5ec1637141bbced36ab67c2cca6c87e9fb6a..24a5b146744fcc235f927267e4f0db28e224de0e 100644 (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; }; \
index b5928b842d8e9a9dc1179f1b509cdab4380f5cec..cbc54cfc7640fce075fcc2a9f3ec27a298d7593c 100644 (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
index 1914a941014d082ec078512cfedda21b4545e547..481386157d098d63f519ec308bf85310ae714ca2 100644 (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
index 789670fb407be8847fc47cca272ee0a44cf6f9cb..ee7e87ce787063bb7b8be7b86ac55a20bcad2c4f 100644 (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
 
index ba903c9db87b2951dc50f0b733d1490a3e57a0a9..18079f7c5c0e1725caf0cc599cfaca345124306b 100644 (file)
@@ -660,6 +660,9 @@ $(DIROBJ):
 {.\}.c{$(DIROBJ)\}.obj:\r
        $(CC) $(CFLAGS) /Fo"$@"  $<\r
 \r
+{.\vauth\}.c{$(DIROBJ)\}.obj:\r
+       $(CC) $(CFLAGS) /Fo"$@"  $<\r
+\r
 {.\vtls\}.c{$(DIROBJ)\}.obj:\r
        $(CC) $(CFLAGS) /Fo"$@"  $<\r
 \r
index c56b57597ed7f38c24539e3dfc80aba6f0108769..3fc696b975bc6dff9cf12eb999c39ed718e94f3d 100644 (file)
   </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>
index cd4bfbd38d10c16d4bcb73eda3be0d74ae90f383..52dc0a678fade010a166d21ec4d971c8d51813b7 100644 (file)
   </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>
index 22b55c545bfc23d12f4e5c0cf6154c91859b74fb..f9adccdd53a525301bd19d3557ee457c154634e2 100644 (file)
   </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>
index 70e5f2ffb38dc9a802fd66edf8239f0fed5d8ef4..208e8b6e03670002229506db448065c6572956fe 100644 (file)
   </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>
index 74c8c9c32da79fc8cf231484eb3de50cd62837f4..669c09b414b8763afffd81b05440131d7a63ee13 100644 (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"
index f27782e53c4e34c03e2b4ada1e3dc29158d05967..054a74790e60e0d6e02079ec81a5647986b53bb0 100644 (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="">
index aa31f80f9443802689b3dbad6e6ee87e230dcd12..65b3ce744ac7325620a246756524f04c15777cfb 100644 (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="">
index b57c49f4e5fc47bab80c7319065b1dd308ea26f6..aa2eb7d484cfa78e06e98c9bd636d3ad0cbb8a2c 100644 (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"
                        >
index f3ec143b858730f755e886d5e37bf49cde33b0e7..6d227fa48e228d1d0b4f39364790a2b3ec3ee6be 100644 (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"
                        >
index 44076b9baef00239614023832fe5a7af082c7269..d631204fe3205387c1e32cca33dccb63955e2872 100644 (file)
@@ -436,6 +436,7 @@ $(DIRDIST):
 \r
 $(LIB_DIROBJ):\r
        @if not exist "$(LIB_DIROBJ)" mkdir $(LIB_DIROBJ)\r
+       @if not exist "$(LIB_DIROBJ)\vauth" mkdir $(LIB_DIROBJ)\vauth\r
        @if not exist "$(LIB_DIROBJ)\vtls" mkdir $(LIB_DIROBJ)\vtls\r
 \r
 $(CURL_DIROBJ):\r
@@ -449,6 +450,9 @@ $(CURL_DIROBJ):
 {$(LIBCURL_SRC_DIR)\}.c{$(LIB_DIROBJ)\}.obj:\r
        $(CC) $(CFLAGS) /Fo"$@"  $<\r
 \r
+{$(LIBCURL_SRC_DIR)\vauth\}.c{$(LIB_DIROBJ)\vauth\}.obj:\r
+       $(CC) $(CFLAGS) /Fo"$@"  $<\r
+\r
 {$(LIBCURL_SRC_DIR)\vtls\}.c{$(LIB_DIROBJ)\vtls\}.obj:\r
        $(CC) $(CFLAGS) /Fo"$@"  $<\r
 \r