summaryrefslogtreecommitdiff
path: root/util/cf/cygwin.rules
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2011-04-02 17:17:49 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2011-04-02 17:17:49 +0000
commitc3c92c113aff78591beaab28e3b28bd27722a333 (patch)
tree9381b4f324b81a48e3aa79642f0f16e4e11853e9 /util/cf/cygwin.rules
parent45d2cfad3bb2ac4246dc1863e5b8689d6bb34fa8 (diff)
Update xorg-cf-files to 1.0.4. Lightly tested by ajacoutot@ and krw@.
Diffstat (limited to 'util/cf/cygwin.rules')
-rw-r--r--util/cf/cygwin.rules13
1 files changed, 6 insertions, 7 deletions
diff --git a/util/cf/cygwin.rules b/util/cf/cygwin.rules
index d144755af..a2215bd71 100644
--- a/util/cf/cygwin.rules
+++ b/util/cf/cygwin.rules
@@ -22,11 +22,11 @@
#define SharedLibXext YES
#define SharedLibXi YES
#define SharedLibXtst YES
-#define SharedOldX YES
-#define SharedLibXp YES
+#define SharedOldX NO
+#define SharedLibXp NO
#define SharedLibGlx YES
-#define SharedLibDps YES
-#define SharedLibDpsTk YES
+#define SharedLibDps NO
+#define SharedLibDpsTk NO
#define SharedLibGlu YES
#define SharedLibWindowsWM NO
#ifndef SharedDataSeparation
@@ -59,7 +59,7 @@
Concat3(cyg,libname,-$(shell echo rev|sed s=\\..*==).dll)
#define ImportLibraryName(libname, rev) \
-Concat3(lib,libname,-$(shell echo rev|sed s=\\..*==).dll.a)
+Concat3(lib,libname,.dll.a)
#define ShortImportLibraryName(libname, rev) \
Concat3(lib,libname,.dll.a)
@@ -233,8 +233,7 @@ step:: @@\
#define InstallSharedLibrary(libname,rev,dest) @@\
InstallTarget(install,ImportLibraryName(libname,rev),$(INSTLIBFLAGS),$(USRLIBDIR)) @@\
-InstallTarget(install,SharedLibraryName(libname,rev),$(INSTBINFLAGS),$(BINDIR)) @@\
-InstallLink(install,ImportLibraryName(libname,rev),ShortImportLibraryName(libname,rev),$(USRLIBDIR))
+InstallTarget(install,SharedLibraryName(libname,rev),$(INSTBINFLAGS),$(BINDIR))
/*