You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.4 KiB
46 lines
1.4 KiB
8 years ago
|
Obey LDFLAGS for tests
|
||
|
|
|
||
2 years ago
|
Upstream-Status: Submitted [https://github.com/madler/zlib/pull/409]
|
||
|
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||
|
8 years ago
|
|
||
|
2 years ago
|
--- a/Makefile.in
|
||
|
|
+++ b/Makefile.in
|
||
|
|
@@ -26,7 +26,7 @@
|
||
|
|
|
||
|
8 years ago
|
SFLAGS=-O
|
||
|
|
LDFLAGS=
|
||
|
|
-TEST_LDFLAGS=-L. libz.a
|
||
|
|
+TEST_LDFLAGS=-L. $(LDFLAGS)
|
||
|
|
LDSHARED=$(CC)
|
||
|
|
CPP=$(CC) -E
|
||
|
2 years ago
|
|
||
|
|
@@ -286,22 +286,22 @@
|
||
|
|
-@rmdir objs
|
||
|
|
|
||
|
8 years ago
|
example$(EXE): example.o $(STATICLIB)
|
||
|
|
- $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
|
||
|
|
+ $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(STATICLIB)
|
||
|
2 years ago
|
|
||
|
8 years ago
|
minigzip$(EXE): minigzip.o $(STATICLIB)
|
||
|
|
- $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
|
||
|
|
+ $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(STATICLIB)
|
||
|
2 years ago
|
|
||
|
8 years ago
|
examplesh$(EXE): example.o $(SHAREDLIBV)
|
||
|
|
- $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
|
||
|
|
+ $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(SHAREDLIBV)
|
||
|
2 years ago
|
|
||
|
8 years ago
|
minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
|
||
|
|
- $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
|
||
|
|
+ $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(SHAREDLIBV)
|
||
|
2 years ago
|
|
||
|
8 years ago
|
example64$(EXE): example64.o $(STATICLIB)
|
||
|
|
- $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
|
||
|
|
+ $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) $(STATICLIB)
|
||
|
2 years ago
|
|
||
|
8 years ago
|
minigzip64$(EXE): minigzip64.o $(STATICLIB)
|
||
|
|
- $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
|
||
|
|
+ $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS) $(STATICLIB)
|
||
|
2 years ago
|
|
||
|
8 years ago
|
install-libs: $(LIBS)
|
||
|
2 years ago
|
-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
|