diff --git a/Makefile.am b/Makefile.am index 20405122d4..944806eef0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,11 +85,6 @@ EXTRA_DIST = CHANGES.md COPYING Makefile.dist \ RELEASE-NOTES $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) \ $(PLAN9_DIST) buildconf.bat Dockerfile -CLEANFILES = $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) \ - $(VC14_10_LIBVCXPROJ) $(VC14_10_SRCVCXPROJ) \ - $(VC14_20_LIBVCXPROJ) $(VC14_20_SRCVCXPROJ) \ - $(VC14_30_LIBVCXPROJ) $(VC14_30_SRCVCXPROJ) - DISTCLEANFILES = buildinfo.txt bin_SCRIPTS = curl-config @@ -100,10 +95,6 @@ DIST_SUBDIRS = $(SUBDIRS) tests packages include docs pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcurl.pc -# List of files required to generate VC IDE .dsp, .vcproj and .vcxproj files -include lib/Makefile.inc -include src/Makefile.inc - dist-hook: rm -rf $(top_builddir)/tests/log find $(distdir) -name "*.dist" -a \! -name Makefile.dist -exec rm {} \; @@ -191,27 +182,6 @@ rpm: mv $$RPM_TOPDIR/RPMS/i386/$(RPMDIST)-*.rpm . ; \ mv $$RPM_TOPDIR/SRPMS/$(RPMDIST)-*.src.rpm . -# -# Build a Solaris pkgadd format file -# run 'make pkgadd' once you've done './configure' and 'make' to make a Solaris pkgadd format -# file (which ends up back in this directory). -# The pkgadd file is in 'pkgtrans' format, so to install on Solaris, do -# pkgadd -d ./HAXXcurl-* -# - -# gak - libtool requires an absolute directory, hence the pwd below... -pkgadd: - umask 022 ; \ - $(MAKE) install DESTDIR=`/bin/pwd`/packages/Solaris/root ; \ - cat COPYING > $(srcdir)/packages/Solaris/copyright ; \ - cd $(srcdir)/packages/Solaris && $(MAKE) package - -# -# Build a Cygwin binary tarball installation file -# resulting .tar.bz2 file will end up at packages/Win32/cygwin -cygwinbin: - $(MAKE) -C packages/Win32/cygwin cygwinbin - # We extend the standard install with a custom hook: if BUILD_DOCS install-data-hook: diff --git a/docs/INSTALL.md b/docs/INSTALL.md index ff924d4938..d0ffcea45e 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -299,7 +299,7 @@ necessary to make the definition of the preprocessor symbol `USE_LWIPSOCK` visible to libcurl and curl compilation processes. To set this definition you have the following alternatives: - - Modify `lib/config-win32.h` and `src/config-win32.h` + - Modify `lib/config-win32.h` - Modify `winbuild/Makefile.vc` - Modify the "Preprocessor Definitions" in the libcurl project diff --git a/lib/.gitignore b/lib/.gitignore index 813b99411e..0e624c8de3 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -3,8 +3,6 @@ # SPDX-License-Identifier: curl *.a -*.imp -*.nlm *.orig *.rej *.res diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index 492d74350c..1e6fce642a 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -32,52 +32,52 @@ /* HEADER FILES */ /* ---------------------------------------------------------------- */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_ARPA_INET_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_FCNTL_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_IO_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_NETDB_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_NETINET_IN_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_SYS_PARAM_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_SYS_SELECT_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_SYS_SOCKET_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_SYS_SOCKIO_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_STAT_H 1 -/* Define if you have the header file */ +/* Define if you have the header file. */ /* #define HAVE_SYS_TIME_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_SYS_TYPES_H 1 */ -/* Define if you have the header file */ +/* Define if you have the header file. */ #define HAVE_SYS_UTIME_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_TERMIO_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #define HAVE_TERMIOS_H 1 */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #if defined(__MINGW32__) #define HAVE_UNISTD_H 1 #endif @@ -86,20 +86,20 @@ /* OTHER HEADER INFO */ /* ---------------------------------------------------------------- */ -/* Define if you have the ANSI C header files. */ +/* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* ---------------------------------------------------------------- */ /* FUNCTIONS */ /* ---------------------------------------------------------------- */ -/* Define if you have the closesocket function. */ +/* Define if you have the closesocket function. */ #define HAVE_CLOSESOCKET 1 -/* Define if you have the gethostname function. */ +/* Define if you have the gethostname function. */ #define HAVE_GETHOSTNAME 1 -/* Define if you have the gettimeofday function. */ +/* Define if you have the gettimeofday function. */ /* #define HAVE_GETTIMEOFDAY 1 */ /* Define if you have the ioctlsocket function. */ @@ -108,21 +108,21 @@ /* Define if you have a working ioctlsocket FIONBIO function. */ #define HAVE_IOCTLSOCKET_FIONBIO 1 -/* Define if you have the select function. */ +/* Define if you have the select function. */ #define HAVE_SELECT 1 -/* Define if you have the socket function. */ +/* Define if you have the socket function. */ #define HAVE_SOCKET 1 -/* Define if you have the strdup function. */ +/* Define if you have the strdup function. */ /* #define HAVE_STRDUP 1 */ -/* Define if you have the strtoll function. */ +/* Define if you have the strtoll function. */ #if defined(__MINGW32__) #define HAVE_STRTOLL 1 #endif -/* Define if you have the utime function */ +/* Define if you have the utime function. */ #define HAVE_UTIME 1 /* Define if you have the recv function. */ @@ -168,10 +168,10 @@ /* TYPEDEF REPLACEMENTS */ /* ---------------------------------------------------------------- */ -/* Define this if in_addr_t is not an available 'typedefed' type */ +/* Define if in_addr_t is not an available 'typedefed' type. */ #define in_addr_t unsigned long -/* Define ssize_t if it is not an available 'typedefed' type */ +/* Define if ssize_t is not an available 'typedefed' type. */ #if defined(_WIN64) #define ssize_t __int64 #else @@ -182,16 +182,16 @@ /* TYPE SIZES */ /* ---------------------------------------------------------------- */ -/* The size of `int', as computed by sizeof. */ +/* Define to the size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 -/* The size of `long long', as computed by sizeof. */ +/* Define to the size of `long long', as computed by sizeof. */ /* #define SIZEOF_LONG_LONG 8 */ /* Define to the size of `long', as computed by sizeof. */ #define SIZEOF_LONG 4 -/* The size of `size_t', as computed by sizeof. */ +/* Define to the size of `size_t', as computed by sizeof. */ #if defined(_WIN64) # define SIZEOF_SIZE_T 8 #else @@ -215,10 +215,10 @@ /* COMPILER SPECIFIC */ /* ---------------------------------------------------------------- */ -/* Undef keyword 'const' if it does not work. */ +/* Undef keyword 'const' if it does not work. */ /* #undef const */ -/* Define to avoid VS2005 complaining about portable C functions */ +/* Define to avoid VS2005 complaining about portable C functions. */ #if defined(_MSC_VER) && (_MSC_VER >= 1400) #define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_NONSTDC_NO_DEPRECATE 1 diff --git a/src/.gitignore b/src/.gitignore index b866dad63e..4f410a9928 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -3,13 +3,8 @@ # SPDX-License-Identifier: curl *.a -*.nlm *.res -config-win32.h curl -curl_config.h -curl_config.h.in stamp-h2 tool_ca_embed.c tool_hugehelp.c -tool_version.h.dist