tidy-up: delete stray references from autotools, docs

- autotools: delete stray `VC14_LIB*` references.
- autotools: delete (now) empty `CLEANFILES`.
- autotools: delete no longer used lib/src .inc includes in root makefile.
- autotools: delete stray `cygwinbin` target.
- autotools: delete stray `pkgadd` target (Solaris).
- lib, src: delete stray files from `.gitignore`.
- INSTALL.md: delete reference to non-existing `src/config-win32.h`.
- lib/config-win32ce.h: whitespace.
- lib/config-win32ce.h: sync comments with `config-win32.h`.

Closes #15944
This commit is contained in:
Viktor Szakats 2025-01-08 19:37:33 +01:00
parent 8a266ac488
commit a19b79ce87
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
5 changed files with 33 additions and 70 deletions

View File

@ -85,11 +85,6 @@ EXTRA_DIST = CHANGES.md COPYING Makefile.dist \
RELEASE-NOTES $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) \ RELEASE-NOTES $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) \
$(PLAN9_DIST) buildconf.bat Dockerfile $(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 DISTCLEANFILES = buildinfo.txt
bin_SCRIPTS = curl-config bin_SCRIPTS = curl-config
@ -100,10 +95,6 @@ DIST_SUBDIRS = $(SUBDIRS) tests packages include docs
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcurl.pc 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: dist-hook:
rm -rf $(top_builddir)/tests/log rm -rf $(top_builddir)/tests/log
find $(distdir) -name "*.dist" -a \! -name Makefile.dist -exec rm {} \; 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/RPMS/i386/$(RPMDIST)-*.rpm . ; \
mv $$RPM_TOPDIR/SRPMS/$(RPMDIST)-*.src.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: # We extend the standard install with a custom hook:
if BUILD_DOCS if BUILD_DOCS
install-data-hook: install-data-hook:

View File

@ -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 visible to libcurl and curl compilation processes. To set this definition you
have the following alternatives: have the following alternatives:
- Modify `lib/config-win32.h` and `src/config-win32.h` - Modify `lib/config-win32.h`
- Modify `winbuild/Makefile.vc` - Modify `winbuild/Makefile.vc`
- Modify the "Preprocessor Definitions" in the libcurl project - Modify the "Preprocessor Definitions" in the libcurl project

2
lib/.gitignore vendored
View File

@ -3,8 +3,6 @@
# SPDX-License-Identifier: curl # SPDX-License-Identifier: curl
*.a *.a
*.imp
*.nlm
*.orig *.orig
*.rej *.rej
*.res *.res

View File

@ -62,13 +62,13 @@
/* Define if you have the <sys/stat.h> header file. */ /* Define if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1 #define HAVE_SYS_STAT_H 1
/* Define if you have the <sys/time.h> header file */ /* Define if you have the <sys/time.h> header file. */
/* #define HAVE_SYS_TIME_H 1 */ /* #define HAVE_SYS_TIME_H 1 */
/* Define if you have the <sys/types.h> header file. */ /* Define if you have the <sys/types.h> header file. */
/* #define HAVE_SYS_TYPES_H 1 */ /* #define HAVE_SYS_TYPES_H 1 */
/* Define if you have the <sys/utime.h> header file */ /* Define if you have the <sys/utime.h> header file. */
#define HAVE_SYS_UTIME_H 1 #define HAVE_SYS_UTIME_H 1
/* Define if you have the <termio.h> header file. */ /* Define if you have the <termio.h> header file. */
@ -122,7 +122,7 @@
#define HAVE_STRTOLL 1 #define HAVE_STRTOLL 1
#endif #endif
/* Define if you have the utime function */ /* Define if you have the utime function. */
#define HAVE_UTIME 1 #define HAVE_UTIME 1
/* Define if you have the recv function. */ /* Define if you have the recv function. */
@ -168,10 +168,10 @@
/* TYPEDEF REPLACEMENTS */ /* 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 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) #if defined(_WIN64)
#define ssize_t __int64 #define ssize_t __int64
#else #else
@ -182,16 +182,16 @@
/* TYPE SIZES */ /* TYPE SIZES */
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
/* The size of `int', as computed by sizeof. */ /* Define to the size of `int', as computed by sizeof. */
#define SIZEOF_INT 4 #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 SIZEOF_LONG_LONG 8 */
/* Define to the size of `long', as computed by sizeof. */ /* Define to the size of `long', as computed by sizeof. */
#define SIZEOF_LONG 4 #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) #if defined(_WIN64)
# define SIZEOF_SIZE_T 8 # define SIZEOF_SIZE_T 8
#else #else
@ -218,7 +218,7 @@
/* Undef keyword 'const' if it does not work. */ /* Undef keyword 'const' if it does not work. */
/* #undef const */ /* #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) #if defined(_MSC_VER) && (_MSC_VER >= 1400)
#define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_SECURE_NO_DEPRECATE 1
#define _CRT_NONSTDC_NO_DEPRECATE 1 #define _CRT_NONSTDC_NO_DEPRECATE 1

5
src/.gitignore vendored
View File

@ -3,13 +3,8 @@
# SPDX-License-Identifier: curl # SPDX-License-Identifier: curl
*.a *.a
*.nlm
*.res *.res
config-win32.h
curl curl
curl_config.h
curl_config.h.in
stamp-h2 stamp-h2
tool_ca_embed.c tool_ca_embed.c
tool_hugehelp.c tool_hugehelp.c
tool_version.h.dist