Changeset e506d6c

Timestamp:

2006-03-02T11:38:33Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

1e5fcac

Parents:

9a1555d

Message:

Install bitlbee's header files and a pkg-config file. This means
that 3rd-parties can write support for additional protocols in BitlBee.

Files:

• Makefile (modified) (3 diffs)
• bitlbee.h (modified) (1 diff)
• configure (modified) (4 diffs)
• doc/example_plugin.c (modified) (1 diff)

Makefile

@@ -11 +11 @@
 # Program variables
 objects = account.o bitlbee.o conf.o crypting.o help.o ini.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_text.o unix.o url.o user.o util.o
+headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ini.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h url.h user.h protocols/http_client.h protocols/md5.h protocols/nogaim.h protocols/proxy.h protocols/sha.h protocols/ssl_client.h
 subdirs = protocols
 
@@ -20 +21 @@
         $(MAKE) -C doc
 
-uninstall: uninstall-bin uninstall-doc
+uninstall: uninstall-bin uninstall-doc uninstall-header uninstall-pc
         @echo -e '\nmake uninstall does not remove files in '$(DESTDIR)$(ETCDIR)', you can use make uninstall-etc to do that.\n'
 
-install: install-bin install-doc
+install: install-bin install-doc install-header install-pc
         @if ! [ -d $(DESTDIR)$(CONFIG) ]; then echo -e '\nThe configuration directory $(DESTDIR)$(CONFIG) does not exist yet, don'\''t forget to create it!'; fi
         @if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then echo -e '\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi
@@ -56 +57 @@
 uninstall-bin:
         rm -f $(DESTDIR)$(BINDIR)/$(OUTFILE)
+
+install-header:
+        mkdir -p $(DESTDIR)$(INCLUDEDIR)
+        install -m 0644 $(headers) $(DESTDIR)$(INCLUDEDIR)
+
+uninstall-header:
+        rm -f $(foreach hdr,$(headers),$(DESTDIR)$(INCLUDEDIR)/$(hdr))
+        -rmdir $(DESTDIR)$(INCLUDEDIR)
+
+install-pc:
+        mkdir -p $(DESTDIR)$(PCDIR)
+        install -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
+
+uninstall-pc:
+        rm -f $(DESTDIR)$(PCDIR)/bitlbee.pc
 
 install-etc:

bitlbee.h

@@ -102 +102 @@
 #include "storage.h"
 #include "set.h"
-#include "protocols/nogaim.h"
+#include "nogaim.h"
 #include "commands.h"
 #include "account.h"

configure

@@ -17 +17 @@
 ipcsocket='/var/run/bitlbee'
 plugindir='$prefix/lib/bitlbee'
+pcdir='$prefix/lib/pkgconfig'
+includedir='$prefix/include/bitlbee'
 
 msn=1
@@ -80 +82 @@
 pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
 ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
+includedir=`eval echo "$includedir" | sed 's/\/\{1,\}/\//g'`
+pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
 
 cat<<EOF>Makefile.settings
@@ -91 +95 @@
 CONFIG=$config
 IPCSOCKET=$ipcsocket
+INCLUDEDIR=$includedir
+PCDIR=$pcdir
 
 ARCH=$arch
@@ -311 +317 @@
 fi
 
+cat <<EOF>bitlbee.pc
+prefix=$prefix
+includedir=$includedir
+
+Name: bitlbee
+Description: IRC to IM gateway
+Requires: glib-2.0
+Version: $BITLBEE_VERSION
+Libs:
+Cflags: -I\${includedir}
+
+EOF
+
 protocols=''
 protoobjs=''

doc/example_plugin.c

@@ -3 +3 @@
  * a shared library and place it in the plugin directory: 
  *
- * gcc -o example.so -shared example.c
+ * gcc -o example.so -shared example.c `pkg-config --cflags bitlbee`
  * cp example.so /usr/local/lib/bitlbee
  */
 #include <stdio.h>
+#include <bitlbee.h>
 
 void init_plugin(void)