Commit 2b342400e4693f51eb8dad14286739606902595e
2019-08-22T23:36:22
Makefile: Fix building both static and shared library at the same time Static library libdl.a must be build without -DSHARED flag for obvious reason. So -DSHARED cannot be in global CFLAGS. Define also two separate test targets: test.exe for shared library and test-static.exe for static library.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
diff --git a/Makefile b/Makefile
index 9f5985e..89c5d68 100644
--- a/Makefile
+++ b/Makefile
@@ -6,13 +6,14 @@ CFLAGS = -Wall -O3 -fomit-frame-pointer
ifeq ($(BUILD_SHARED),yes)
TARGETS += libdl.dll
- SHFLAGS += -Wl,--out-implib,libdl.dll.a
- CFLAGS += -DSHARED
+ SHFLAGS += -Wl,--out-implib,libdl.dll.a -DSHARED
INSTALL += shared-install
+ TESTS += test.exe
endif
ifeq ($(BUILD_STATIC),yes)
TARGETS += libdl.a
INSTALL += static-install
+ TESTS += test-static.exe
endif
ifeq ($(BUILD_MSVC),yes)
TARGETS += libdl.lib
@@ -20,20 +21,18 @@ ifeq ($(BUILD_MSVC),yes)
INSTALL += lib-install
endif
-LIB_OBJS := dlfcn.o
+SOURCES := dlfcn.c
HEADERS := dlfcn.h
all: $(TARGETS)
-%.o: %.c
- $(CC) -o $@ -c $< $(CFLAGS)
+libdl.a: $(SOURCES)
+ $(CC) $(CFLAGS) -c $^
+ $(AR) cru $@ $(SOURCES:%.c=%.o)
+ $(RANLIB) $@
-libdl.a: $(LIB_OBJS)
- $(AR) cru $@ $^
- $(RANLIB) libdl.a
-
-libdl.dll: $(LIB_OBJS)
- $(CC) $(SHFLAGS) -shared -o $@ $^
+libdl.dll: $(SOURCES)
+ $(CC) $(CFLAGS) $(SHFLAGS) -shared -o $@ $^
libdl.lib: libdl.dll
$(LIBCMD) /machine:i386 /def:libdl.def
@@ -59,27 +58,30 @@ lib-install:
install: $(INSTALL)
-test.exe: test.o $(TARGETS)
- $(CC) -o $@ $< -L. -ldl
+test.exe: test.c $(TARGETS)
+ $(CC) $(CFLAGS) -o $@ $< libdl.dll.a
+
+test-static.exe: test.c $(TARGETS)
+ $(CC) $(CFLAGS) -o $@ $< libdl.a
testdll.dll: testdll.c
- $(CC) -shared -o $@ $^
+ $(CC) $(CFLAGS) -shared -o $@ $^
testdll2.dll: testdll2.c $(TARGETS)
- $(CC) -shared -o $@ $< -L. -ldl
+ $(CC) $(CFLAGS) -shared -o $@ $< -L. -ldl
testdll3.dll: testdll3.c
$(CC) -shared -o $@ $^
-test: $(TARGETS) test.exe testdll.dll testdll2.dll testdll3.dll
- $(WINE) test.exe
+test: $(TARGETS) $(TESTS) testdll.dll testdll2.dll testdll3.dll
+ for test in $(TESTS); do $(WINE) $$test || exit 1; done
clean::
rm -f \
dlfcn.o \
libdl.dll libdl.a libdl.def libdl.dll.a libdl.lib libdl.exp \
tmptest.c tmptest.dll \
- test.exe testdll.dll testdll2.dll testdll3.dll
+ test.exe test-static.exe testdll.dll testdll2.dll testdll3.dll
distclean: clean
rm -f config.mak