diff options
| author | James Muir <james@openssl.org> | 2023-11-10 20:02:00 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-11-15 08:43:23 +0100 |
| commit | 86db958835d1f8ba9ce49a9f93b5309c3d13b91c (patch) | |
| tree | 39e47920c615243afc3dd7df206a54ec05fa1045 /demos/keyexch/Makefile | |
| parent | Import repro from #22708 as a test case (diff) | |
| download | openssl-86db958835d1f8ba9ce49a9f93b5309c3d13b91c.tar.xz openssl-86db958835d1f8ba9ce49a9f93b5309c3d13b91c.zip | |
demos: tidy up makefiles, fix warnings
Update makefiles so that consistent patterns are used. Object files
are compiled from source using an implicit rule (but using our
CFLAGS); for linking, we give an explicit rule. Ensure that "make
test" works in each subdirectory (even if it does not actually run any
applications). The top-level demo makefile now works.
The makefiles are not make-agnostic. e.g. they use the variable $(RM)
in "clean" recipes, which is defined in gnu-make but may not be
defined in others.
Part of #17806
Testing:
$ cd demo
$ make test
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22698)
Diffstat (limited to 'demos/keyexch/Makefile')
| -rw-r--r-- | demos/keyexch/Makefile | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/demos/keyexch/Makefile b/demos/keyexch/Makefile index 24243e13a4..f8018a13df 100644 --- a/demos/keyexch/Makefile +++ b/demos/keyexch/Makefile @@ -1,20 +1,22 @@ # -# To run the demos when linked with a shared library (default): +# To run the demos when linked with a shared library (default) ensure +# that libcrypto is on the library path. For example: # # LD_LIBRARY_PATH=../.. ./x25519 -CFLAGS = -I../../include -g -Wall -LDFLAGS = -L../.. -LDLIBS = -lcrypto +TESTS = x25519 -TESTS=x25519 +CFLAGS = -I../../include -g -Wall +LDFLAGS = -L../.. +LDLIBS = -lcrypto all: $(TESTS) -%.o: %.c - $(CC) $(CFLAGS) -c $< +x25519: x25519.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) -%x25519: %x25519.o +clean: + $(RM) *.o $(TESTS) .PHONY: test test: all @@ -23,6 +25,3 @@ test: all echo "\n"$$tst; \ LD_LIBRARY_PATH=../.. ./$$tst; \ done - -clean: - $(RM) *.o $(TESTS) |