diff options
author | Ramiro Polla <ramiro.polla@gmail.com> | 2009-01-11 21:31:27 +0000 |
---|---|---|
committer | Ramiro Polla <ramiro.polla@gmail.com> | 2009-01-11 21:31:27 +0000 |
commit | 5da418e92a0797f0ab81db571265300738179e0b (patch) | |
tree | 0a894bb70539c392b08614a91d09b53b8972b060 | |
parent | 3cacb13dd6c56f4214606d29f42257b06b1a5b0c (diff) | |
download | dlfcn-win32-5da418e92a0797f0ab81db571265300738179e0b.tar.gz dlfcn-win32-5da418e92a0797f0ab81db571265300738179e0b.tar.bz2 dlfcn-win32-5da418e92a0797f0ab81db571265300738179e0b.zip |
Move libcmd to configure.
-rw-r--r-- | Makefile | 3 | ||||
-rwxr-xr-x | configure | 3 |
2 files changed, 3 insertions, 3 deletions
@@ -14,10 +14,7 @@ ifeq ($(BUILD_STATIC),yes) | |||
14 | endif | 14 | endif |
15 | ifeq ($(BUILD_MSVC),yes) | 15 | ifeq ($(BUILD_MSVC),yes) |
16 | SHFLAGS+=-Wl,--output-def,libdl.def | 16 | SHFLAGS+=-Wl,--output-def,libdl.def |
17 | LIBCMD=lib | ||
18 | INSTALL+=lib-install | 17 | INSTALL+=lib-install |
19 | else | ||
20 | LIBCMD=echo ignoring lib | ||
21 | endif | 18 | endif |
22 | 19 | ||
23 | all: $(TARGETS) | 20 | all: $(TARGETS) |
@@ -162,6 +162,8 @@ if enabled shared; then | |||
162 | lib /? > /dev/null 2>&1 /dev/null && enable msvc || disable msvc | 162 | lib /? > /dev/null 2>&1 /dev/null && enable msvc || disable msvc |
163 | fi | 163 | fi |
164 | 164 | ||
165 | enabled msvc && libcmd="lib" || libcmd="echo ignoring lib" | ||
166 | |||
165 | echo "# Automatically generated by configure" > config.mak | 167 | echo "# Automatically generated by configure" > config.mak |
166 | echo "PREFIX=$PREFIX" >> config.mak | 168 | echo "PREFIX=$PREFIX" >> config.mak |
167 | echo "libdir=$libdir" >> config.mak | 169 | echo "libdir=$libdir" >> config.mak |
@@ -173,6 +175,7 @@ echo "STRIP=$strip" >> config.mak | |||
173 | echo "BUILD_SHARED=$shared" >> config.mak | 175 | echo "BUILD_SHARED=$shared" >> config.mak |
174 | echo "BUILD_STATIC=$static" >> config.mak | 176 | echo "BUILD_STATIC=$static" >> config.mak |
175 | echo "BUILD_MSVC=$msvc" >> config.mak | 177 | echo "BUILD_MSVC=$msvc" >> config.mak |
178 | echo "LIBCMD=$libcmd" >> config.mak | ||
176 | 179 | ||
177 | echo "prefix: $PREFIX" | 180 | echo "prefix: $PREFIX" |
178 | echo "libdir: $libdir" | 181 | echo "libdir: $libdir" |