Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/Makefile.am,v
retrieving revision 1.52
diff -u -p -u -r1.52 Makefile.am
--- Makefile.am	11 May 2004 14:20:24 -0000	1.52
+++ Makefile.am	19 May 2004 15:05:56 -0000
@@ -1,6 +1,7 @@
 EXTRA_DIST = \
 		COPYRIGHT \
 		Doxyfile.in \
+		gaim.pc.in \
 		gaim.spec.in \
 		gaim.desktop \
 		gaim2blt.pl \
@@ -22,6 +23,12 @@ EXTRA_DIST = \
 		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)
 
Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.248
diff -u -p -u -r1.248 configure.ac
--- configure.ac	12 May 2004 03:42:13 -0000	1.248
+++ configure.ac	19 May 2004 15:05:57 -0000
@@ -1149,6 +1149,7 @@ AC_OUTPUT([Makefile
 		   src/protocols/trepia/Makefile
 		   src/protocols/yahoo/Makefile
 		   src/protocols/zephyr/Makefile
+		   gaim.pc
 		   gaim.spec
 		  ])
 
Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.95
diff -u -p -u -r1.95 gaim.spec.in
--- gaim.spec.in	15 Jan 2004 22:55:09 -0000	1.95
+++ gaim.spec.in	19 May 2004 15:05:57 -0000
@@ -22,6 +22,7 @@ BuildRequires: libao-devel, gtk2-devel, 
 %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 @@ rm -rf %{buildroot}
 
 %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 <eblanton@cs.ohiou.edu>
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v
retrieving revision 1.154
diff -u -p -u -r1.154 Makefile.am
--- src/Makefile.am	19 Apr 2004 21:12:42 -0000	1.154
+++ src/Makefile.am	19 May 2004 15:05:57 -0000
@@ -56,144 +56,156 @@ EXTRA_DIST = \
 
 SUBDIRS = protocols
 
-CORESOURCES = \
+gaim_core_SOURCES = \
 	account.c \
-	account.h \
 	accountopt.c \
+	blist.c \
+	buddyicon.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.h \
 	away.h \
-	blist.c \
 	blist.h \
-	buddyicon.c \
 	buddyicon.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 \
+	blist.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 = \