diff options
author | Viktor Szakats <commit@vsz.me> | 2022-11-22 08:25:05 +0000 |
---|---|---|
committer | Viktor Szakats <commit@vsz.me> | 2022-11-22 08:28:41 +0000 |
commit | a8861b6ccdd7ca35b6115588a578e36d765c9e38 (patch) | |
tree | e61fd7c69aa00984a4cc1a2da584272e793d1661 /Makefile.dist | |
parent | 4a8b4a1b6635f1dc811b65a9355b89f0277da1f2 (diff) | |
download | curl-a8861b6ccdd7ca35b6115588a578e36d765c9e38.tar.gz |
Makefile.mk: portable Makefile.m32
Update bare GNU Make `Makefile.m32` to:
- Move objects into a subdirectory.
- Add support for MS-DOS. Tested with DJGPP.
- Add support for Watt-32 (on MS-DOS).
- Add support for AmigaOS.
- Rename `Makefile.m32` to `Makefile.mk`
- Replace `ARCH` with `TRIPLET`.
- Build `tool_hugehelp.c` proper (when tools are available).
- Drop MS-DOS compatibility macro `USE_ZLIB` (replaced by `HAVE_LIBZ`)
- Add support for `ZLIB_LIBS` to override `-lz`.
- Omit object files when building examples.
- Default `CC` to `gcc` once again, for convenience. (Caveat: compiler
name `cc` cannot be set now.)
- Set `-DCURL_NO_OLDIES` for examples, like autotools does.
- Delete `makefile.dj` files. Notice the configuration details and
defaults are not retained with the new method.
- Delete `makefile.amiga` files. A successful build needs a few custom
options. We're also not retaining all build details from the existing
Amiga make files.
- Rename `Makefile.m32` to `Makefile.mk` to reflect that they are not
Windows/MinGW32-specific anymore.
- Add support for new `CFG` options: `-map`, `-debug`, `-trackmem`
- Set `-DNDEBUG` by default.
- Allow using `-DOS=...` in all `lib/config-*.h` headers, syncing this
with `config-win32.h`.
- Look for zlib parts in `ZLIB_PATH/include` and `ZLIB_PATH/lib`
instead of bare `ZLIB_PATH`.
Note that existing build configurations for MS-DOS and AmigaOS likely
become incompatible with this change.
Example AmigaOS configuration:
```
export CROSSPREFIX=/opt/amiga/bin/m68k-amigaos-
export CC=gcc
export CPPFLAGS='-DHAVE_PROTO_BSDSOCKET_H'
export CFLAGS='-mcrt=clib2'
export LDFLAGS="${CFLAGS}"
export LIBS='-lnet -lm'
make -C lib -f Makefile.mk
make -C src -f Makefile.mk
```
Example MS-DOS configuration:
```
export CROSSPREFIX=/opt/djgpp/bin/i586-pc-msdosdjgpp-
export WATT_PATH=/opt/djgpp/net/watt
export ZLIB_PATH=/opt/djgpp
export OPENSSL_PATH=/opt/djgpp
export OPENSSL_LIBS='-lssl -lcrypt'
export CFG=-zlib-ssl
make -C lib -f Makefile.mk
make -C src -f Makefile.mk
```
Closes #9764
Diffstat (limited to 'Makefile.dist')
-rw-r--r-- | Makefile.dist | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Makefile.dist b/Makefile.dist index ab5a9b5f3..dbb396553 100644 --- a/Makefile.dist +++ b/Makefile.dist @@ -31,25 +31,25 @@ ssl: make mingw32: - $(MAKE) -C lib -f Makefile.m32 - $(MAKE) -C src -f Makefile.m32 + $(MAKE) -C lib -f Makefile.mk + $(MAKE) -C src -f Makefile.mk mingw32-clean: - $(MAKE) -C lib -f Makefile.m32 clean - $(MAKE) -C src -f Makefile.m32 clean - $(MAKE) -C docs/examples -f Makefile.m32 clean + $(MAKE) -C lib -f Makefile.mk clean + $(MAKE) -C src -f Makefile.mk clean + $(MAKE) -C docs/examples -f Makefile.mk clean mingw32-vclean mingw32-distclean: - $(MAKE) -C lib -f Makefile.m32 vclean - $(MAKE) -C src -f Makefile.m32 vclean - $(MAKE) -C docs/examples -f Makefile.m32 vclean + $(MAKE) -C lib -f Makefile.mk vclean + $(MAKE) -C src -f Makefile.mk vclean + $(MAKE) -C docs/examples -f Makefile.mk vclean mingw32-examples%: - $(MAKE) -C docs/examples -f Makefile.m32 CFG=$@ + $(MAKE) -C docs/examples -f Makefile.mk CFG=$@ mingw32%: - $(MAKE) -C lib -f Makefile.m32 CFG=$@ - $(MAKE) -C src -f Makefile.m32 CFG=$@ + $(MAKE) -C lib -f Makefile.mk CFG=$@ + $(MAKE) -C src -f Makefile.mk CFG=$@ vc: cd winbuild @@ -59,9 +59,9 @@ vc-x64: cd winbuild nmake /f Makefile.vc MACHINE=x64 -djgpp: - $(MAKE) -C lib -f Makefile.dj - $(MAKE) -C src -f Makefile.dj +djgpp%: + $(MAKE) -C lib -f Makefile.mk CFG=$@ CROSSPREFIX=i586-pc-msdosdjgpp- + $(MAKE) -C src -f Makefile.mk CFG=$@ CROSSPREFIX=i586-pc-msdosdjgpp- cygwin: ./configure @@ -71,9 +71,9 @@ cygwin-ssl: ./configure --with-openssl make -amiga: - cd ./lib && make -f makefile.amiga - cd ./src && make -f makefile.amiga +amiga%: + $(MAKE) -C lib -f Makefile.mk CFG=$@ CROSSPREFIX=m68k-amigaos- + $(MAKE) -C src -f Makefile.mk CFG=$@ CROSSPREFIX=m68k-amigaos- unix: all |