SF.net SVN: geany: [2333] trunk

[eht16 at users.sourceforge.net]

Revision: 2333
          http://geany.svn.sourceforge.net/geany/?rev=2333&view=rev
Author:   eht16
Date:     2008-03-13 05:15:26 -0700 (Thu, 13 Mar 2008)

Log Message:
-----------
Install header files and add a pkg-config file for external plugins.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/Makefile.am
    trunk/configure.in
    trunk/plugins/Makefile.am
    trunk/scintilla/include/Makefile.am
    trunk/src/Makefile.am
    trunk/tagmanager/include/Makefile.am

Added Paths:
-----------
    trunk/geany.pc.in

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-03-13 12:06:10 UTC (rev 2332)
+++ trunk/ChangeLog	2008-03-13 12:15:26 UTC (rev 2333)
@@ -10,6 +10,10 @@
    config file instead of using g_find_program_in_path(), patch by
    Yura Siamashka (thanks).
    Fix executable check for grep command.
+ * scintilla/include/Makefile.am, src/Makefile.am, plugins/Makefile.am,
+   tagmanager/include/Makefile.am, Makefile.am, geany.pc.in,
+   configure.in:
+   Install header files and add a pkg-config file for external plugins.
 
 
 2008-03-12  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-03-13 12:06:10 UTC (rev 2332)
+++ trunk/Makefile.am	2008-03-13 12:15:26 UTC (rev 2333)
@@ -23,6 +23,7 @@
 EXTRA_DIST = \
 	autogen.sh \
 	geany.desktop.in \
+	geany.pc.in \
 	geany.spec \
 	geany.glade \
 	geany.gladep \
@@ -92,6 +93,9 @@
 
 logodir = $(datadir)/pixmaps
 
+pkgconfig_DATA = geany.pc
+pkgconfigdir = $(libdir)/pkgconfig
+
 desktopdir = $(datadir)/applications
 desktop_in_files = geany.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2008-03-13 12:06:10 UTC (rev 2332)
+++ trunk/configure.in	2008-03-13 12:15:26 UTC (rev 2333)
@@ -245,6 +245,7 @@
 doc/geany.1
 geany.spec
 geany.desktop.in
+geany.pc
 doc/Doxyfile
 ])
 

Added: trunk/geany.pc.in
===================================================================
--- trunk/geany.pc.in	                        (rev 0)
+++ trunk/geany.pc.in	2008-03-13 12:15:26 UTC (rev 2333)
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Geany
+Description: A fast and lightweight IDE using GTK2
+Requires: gtk+-2.0 >= 2.6.0
+Version: @VERSION@
+Libs: -L${libdir}
+Cflags: -I${includedir}/geany -I${includedir}/geany/tagmanager -I${includedir}/geany/scintilla

Modified: trunk/plugins/Makefile.am
===================================================================
--- trunk/plugins/Makefile.am	2008-03-13 12:06:10 UTC (rev 2332)
+++ trunk/plugins/Makefile.am	2008-03-13 12:15:26 UTC (rev 2333)
@@ -6,6 +6,9 @@
 
 plugindir = $(libdir)/geany
 
+plugins_includedir = $(includedir)/geany/
+plugins_include_HEADERS = pluginmacros.h
+
 demoplugin_la_LDFLAGS    = -module -avoid-version
 classbuilder_la_LDFLAGS  = -module -avoid-version
 htmlchars_la_LDFLAGS     = -module -avoid-version

Modified: trunk/scintilla/include/Makefile.am
===================================================================
--- trunk/scintilla/include/Makefile.am	2008-03-13 12:06:10 UTC (rev 2332)
+++ trunk/scintilla/include/Makefile.am	2008-03-13 12:15:26 UTC (rev 2333)
@@ -5,9 +5,11 @@
 	KeyWords.h \
 	Platform.h \
 	PropSet.h \
-	SciLexer.h \
-	Scintilla.h \
-	ScintillaWidget.h \
 	WindowAccessor.h \
 	SString.h
 
+scintilla_includedir = $(includedir)/geany/scintilla/
+scintilla_include_HEADERS = \
+	SciLexer.h \
+	Scintilla.h \
+	ScintillaWidget.h

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2008-03-13 12:06:10 UTC (rev 2332)
+++ trunk/src/Makefile.am	2008-03-13 12:15:26 UTC (rev 2333)
@@ -41,12 +41,29 @@
 	ui_utils.c ui_utils.h \
 	utils.c utils.h
 
-# just to make "make distcheck" happy
-noinst_HEADERS = \
+
+geany_includedir = $(includedir)/geany/
+geany_include_HEADERS = \
+	dialogs.h \
+	document.h \
+	editor.h \
+	encodings.h \
+	filetypes.h \
+	highlighting.h \
+	keybindings.h \
 	geany.h \
+	msgwindow.h \
+	plugins.h \
+	plugindata.h \
+	project.h \
+	sciwrappers.h \
+	search.h \
 	support.h \
-	plugindata.h
+	templates.h \
+	ui_utils.h \
+	utils.h
 
+
 INCLUDES = -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include @GTK_CFLAGS@
 
 # tell automake we have a C++ file so it uses the C++ linker we need for Scintilla

Modified: trunk/tagmanager/include/Makefile.am
===================================================================
--- trunk/tagmanager/include/Makefile.am	2008-03-13 12:06:10 UTC (rev 2332)
+++ trunk/tagmanager/include/Makefile.am	2008-03-13 12:15:26 UTC (rev 2333)
@@ -1,11 +1,13 @@
 noinst_HEADERS = \
-	regex.h \
-	tm_project.h\
-	tm_source_file.h\
-	tm_tag.h\
-	tm_work_object.h\
-	tm_workspace.h\
-	tm_symbol.h\
-	tm_tagmanager.h\
+	regex.h
+
+tagmanager_includedir = $(includedir)/geany/tagmanager/
+tagmanager_include_HEADERS = \
+	tm_project.h \
+	tm_source_file.h \
+	tm_tag.h \
+	tm_work_object.h \
+	tm_workspace.h \
+	tm_symbol.h \
+	tm_tagmanager.h \
 	tm_file_entry.h
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.