# HG changeset patch # User Ethan Blanton # Date 1088020558 0 # Node ID 63f07fa577ebb2a742088f4cec02cb0693528881 # Parent 997c2857136422f79b77bad282672f48854a69ce [gaim-migrate @ 10172] Patch #901874, from Stu Tomlinson -- distributes headers on make install committer: Tailor Script diff -r 997c28571364 -r 63f07fa577eb Makefile.am --- a/Makefile.am Wed Jun 23 19:38:58 2004 +0000 +++ b/Makefile.am Wed Jun 23 19:55:58 2004 +0000 @@ -1,6 +1,7 @@ EXTRA_DIST = \ COPYRIGHT \ Doxyfile.in \ + gaim.pc.in \ gaim.spec.in \ gaim.desktop \ gaim2blt.pl \ @@ -23,6 +24,12 @@ plugins/win32/winprefs/winprefs.c \ po/Makefile.mingw +gaimincludedir=$(includedir)/gaim +gaiminclude_HEADERS = config.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gaim.pc + dist-hook: gaim.spec cp gaim.spec $(distdir) diff -r 997c28571364 -r 63f07fa577eb configure.ac --- a/configure.ac Wed Jun 23 19:38:58 2004 +0000 +++ b/configure.ac Wed Jun 23 19:55:58 2004 +0000 @@ -1170,6 +1170,7 @@ src/protocols/trepia/Makefile src/protocols/yahoo/Makefile src/protocols/zephyr/Makefile + gaim.pc gaim.spec ]) diff -r 997c28571364 -r 63f07fa577eb gaim.pc.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gaim.pc.in Wed Jun 23 19:55:58 2004 +0000 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +datadir=@datadir@ + +Name: Gaim +Description: Gaim is a GTK2-based instant messenger application. +Version: @VERSION@ +Requires: glib-2.0 +Cflags: -I${includedir}/gaim + diff -r 997c28571364 -r 63f07fa577eb gaim.spec.in --- a/gaim.spec.in Wed Jun 23 19:38:58 2004 +0000 +++ b/gaim.spec.in Wed Jun 23 19:55:58 2004 +0000 @@ -22,6 +22,7 @@ %package devel Summary: Development headers, documentation, and libraries for Gaim. Group: Applications/Internet +Requires: gaim = %{epoch}:%{version} %description Gaim allows you to talk to anyone using a variety of messaging @@ -96,7 +97,10 @@ %attr(755, root, root) %{_libdir}/libgaim-remote.la %dir %{_includedir}/gaim-remote +%dir %{_includedir}/gaim %{_includedir}/gaim-remote/*.h +%{_includedir}/gaim/*.h +%{_libdir}/pkgconfig/gaim.pc %changelog * Thu Jan 15 2004 Ethan Blanton diff -r 997c28571364 -r 63f07fa577eb src/Makefile.am --- a/src/Makefile.am Wed Jun 23 19:38:58 2004 +0000 +++ b/src/Makefile.am Wed Jun 23 19:55:58 2004 +0000 @@ -57,146 +57,157 @@ SUBDIRS = protocols -CORESOURCES = \ +gaim_core_SOURCES = \ account.c \ + accountopt.c \ + blist.c \ + buddyicon.c \ + cmds.c \ + connection.c \ + conversation.c \ + core.c \ + debug.c \ + eventloop.c \ + ft.c \ + imgstore.c \ + log.c \ + md5.c \ + network.c \ + notify.c \ + plugin.c \ + pluginpref.c \ + pounce.c \ + privacy.c \ + proxy.c \ + prefs.c \ + prpl.c \ + request.c \ + roomlist.c \ + server.c \ + sha.c \ + signals.c \ + status.c \ + stringref.c \ + sound.c \ + sslconn.c \ + util.c \ + value.c \ + xmlnode.c + +gaim_coreheaders = \ account.h \ - accountopt.c \ accountopt.h \ away.h \ - blist.c \ blist.h \ - buddyicon.c \ buddyicon.h \ - cmds.c \ cmds.h \ - connection.c \ connection.h \ - conversation.c \ conversation.h \ - core.c \ core.h \ - debug.c \ debug.h \ - eventloop.c \ eventloop.h \ - ft.c \ ft.h \ - imgstore.c \ imgstore.h \ - log.c \ log.h \ - md5.c \ md5.h \ multi.h \ - network.c \ network.h \ - notify.c \ notify.h \ - plugin.c \ plugin.h \ - pluginpref.c \ pluginpref.h \ - pounce.c \ pounce.h \ - privacy.c \ privacy.h \ - proxy.c \ proxy.h \ - prefs.c \ prefs.h \ - prpl.c \ prpl.h \ - request.c \ request.h \ - roomlist.c \ roomlist.h \ - server.c \ server.h \ - sha.c \ sha.h \ - signals.c \ signals.h \ - status.c \ status.h \ - stringref.c \ stringref.h \ - sound.c \ sound.h \ - sslconn.c \ sslconn.h \ - util.c \ util.h \ - value.c \ value.h \ - xmlnode.c \ xmlnode.h bin_PROGRAMS = gaim gaim-remote + gaim_SOURCES = \ - $(CORESOURCES) \ + $(gaim_core_SOURCES) \ about.c \ away.c \ dialogs.c \ dnd-hints.c \ - dnd-hints.h \ - gaim.h \ gaim-disclosure.c \ - gaim-disclosure.h \ gaimrc.c \ gtkaccount.c \ - gtkaccount.h \ gtkcellrendererprogress.c \ - gtkcellrendererprogress.h \ gtkblist.c \ - gtkblist.h \ gtkconn.c \ - gtkconn.h \ gtkconv.c \ - gtkconv.h \ gtkdebug.c \ - gtkdebug.h \ gtkeventloop.c \ - gtkeventloop.h \ gtkft.c \ - gtkft.h \ gtkimhtml.c \ - gtkimhtml.h \ gtkimhtmltoolbar.c \ - gtkimhtmltoolbar.h \ - gtkinternal.h \ gtklog.c \ - gtklog.h \ gtknotify.c \ - gtknotify.h \ gtkplugin.c \ - gtkplugin.h \ gtkpluginpref.c \ - gtkpluginpref.h \ gtkprefs.c \ - gtkprefs.h \ gtkprivacy.c \ - gtkprivacy.h \ gtkpounce.c \ - gtkpounce.h \ gtkrequest.c \ - gtkrequest.h \ gtkroomlist.c \ - gtkroomlist.h \ gtksound.c \ - gtksound.h \ gtksourceiter.c \ - gtksourceiter.h \ gtkutils.c \ - gtkutils.h \ idle.c \ - internal.h \ main.c \ session.c \ stock.c \ + themes.c + +gaim_headers = \ + $(gaim_coreheaders) \ + dnd-hints.h \ + gaim.h \ + gaim-disclosure.h \ + gtkaccount.h \ + gtkcellrendererprogress.h \ + gtkblist.h \ + gtkconn.h \ + gtkconv.h \ + gtkdebug.h \ + gtkeventloop.h \ + gtkft.h \ + gtkimhtml.h \ + gtkimhtmltoolbar.h \ + gtkinternal.h \ + gtklog.h \ + gtknotify.h \ + gtkplugin.h \ + gtkpluginpref.h \ + gtkprefs.h \ + gtkprivacy.h \ + gtkpounce.h \ + gtkrequest.h \ + gtkroomlist.h \ + gtksound.h \ + gtksourceiter.h \ + gtkutils.h \ + internal.h \ stock.h \ - themes.c \ ui.h +gaimincludedir=$(includedir)/gaim +gaiminclude_HEADERS = \ + $(gaim_coreheaders) \ + $(gaim_headers) + gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) gaim_LDFLAGS = -export-dynamic gaim_LDADD = \