aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2009-01-11 21:31:27 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2009-01-11 21:31:27 +0000
commit5da418e92a0797f0ab81db571265300738179e0b (patch)
tree0a894bb70539c392b08614a91d09b53b8972b060
parent3cacb13dd6c56f4214606d29f42257b06b1a5b0c (diff)
downloaddlfcn-win32-5da418e92a0797f0ab81db571265300738179e0b.tar.gz
dlfcn-win32-5da418e92a0797f0ab81db571265300738179e0b.tar.bz2
dlfcn-win32-5da418e92a0797f0ab81db571265300738179e0b.zip
Move libcmd to configure.
-rw-r--r--Makefile3
-rwxr-xr-xconfigure3
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 6ea3109..b64ad0a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,7 @@ ifeq ($(BUILD_STATIC),yes)
14endif 14endif
15ifeq ($(BUILD_MSVC),yes) 15ifeq ($(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
19else
20 LIBCMD=echo ignoring lib
21endif 18endif
22 19
23all: $(TARGETS) 20all: $(TARGETS)
diff --git a/configure b/configure
index b962057..3ae2f88 100755
--- a/configure
+++ b/configure
@@ -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
163fi 163fi
164 164
165enabled msvc && libcmd="lib" || libcmd="echo ignoring lib"
166
165echo "# Automatically generated by configure" > config.mak 167echo "# Automatically generated by configure" > config.mak
166echo "PREFIX=$PREFIX" >> config.mak 168echo "PREFIX=$PREFIX" >> config.mak
167echo "libdir=$libdir" >> config.mak 169echo "libdir=$libdir" >> config.mak
@@ -173,6 +175,7 @@ echo "STRIP=$strip" >> config.mak
173echo "BUILD_SHARED=$shared" >> config.mak 175echo "BUILD_SHARED=$shared" >> config.mak
174echo "BUILD_STATIC=$static" >> config.mak 176echo "BUILD_STATIC=$static" >> config.mak
175echo "BUILD_MSVC=$msvc" >> config.mak 177echo "BUILD_MSVC=$msvc" >> config.mak
178echo "LIBCMD=$libcmd" >> config.mak
176 179
177echo "prefix: $PREFIX" 180echo "prefix: $PREFIX"
178echo "libdir: $libdir" 181echo "libdir: $libdir"