Changeset 54b2a36

Timestamp:

2017-05-13T20:38:35Z (7 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

e199620

Parents:

eb73d05

Message:

cygwin: Export a "libbitlbee.dll.a" to allow plugins to link to it

Files:

• Makefile (modified) (1 diff)
• configure (modified) (6 diffs)

Makefile

@@ -94 +94 @@
         mkdir -p $(DESTDIR)$(SBINDIR)
         $(INSTALL) -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
+ifdef IMPLIB
+        # import library for cygwin
+        $(INSTALL) -m 0644 $(IMPLIB) $(DESTDIR)$(LIBDIR)/$(IMPLIB)
+endif
 
 uninstall-bin:
         rm -f $(DESTDIR)$(SBINDIR)/$(OUTFILE)
+ifdef IMPLIB
+        rm -f $(DESTDIR)$(LIBDIR)/$(IMPLIB)
+endif
 
 install-dev:

configure

@@ -15 +15 @@
 datadir='$prefix/share/bitlbee/'
 config='/var/lib/bitlbee/'
+libdir='$prefix/lib/'
 plugindir='$prefix/lib/bitlbee/'
 includedir='$prefix/include/bitlbee/'
@@ -173 +174 @@
 datadir=$(eval echo "$datadir/" | sed 's/\/\{1,\}/\//g')
 config=$(eval echo "$config/" | sed 's/\/\{1,\}/\//g')
+libdir=$(eval echo "$libdir/" | sed 's/\/\{1,\}/\//g')
 plugindir=$(eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g')
 includedir=$(eval echo "$includedir"/ | sed 's/\/\{1,\}/\//g')
@@ -196 +198 @@
 PLUGINDIR=$plugindir
 CONFIG=$config
+LIBDIR=$libdir
 INCLUDEDIR=$includedir
 PCDIR=$pcdir
@@ -800 +803 @@
 fi
 
+pkgconfiglibs=''
+case "$arch" in
+CYGWIN* )
+        pkgconfiglibs='-L${libdir} -lbitlbee'
+esac
+
 cat <<EOF >bitlbee.pc
 prefix=$prefix
 includedir=$includedir
 plugindir=$plugindir
+libdir=$libdir
 
 Name: bitlbee
@@ -809 +819 @@
 Requires: glib-2.0
 Version: $BITLBEE_VERSION
-Libs:
+Libs: $pkgconfiglibs
 Cflags: -I\${includedir}
 
@@ -919 +929 @@
 ;;
 CYGWIN* )
+        echo 'EFLAGS+=-Wl,--export-all,--out-implib,libbitlbee.dll.a' >> Makefile.settings
+        echo 'IMPLIB=libbitlbee.dll.a' >> Makefile.settings
 ;;
 Windows )