[gedit/libgpe: 6/21] Make libgedit.la an installable library.

[Steve Frécinaux <sfre src gnome org>]

commit 9f7f7b8da5b05f1c57238ceec39b87363d4dd922
Author: Steve Frécinaux <code istique net>
Date:   Sun Nov 1 18:51:24 2009 +0100

    Make libgedit.la an installable library.
    
    The reason is that if you don't do so, then the symbols which are not
    used in the binary get dropped by libtool when linking the static
    libgedit into the bonary, no matter what you do.
    
    This fixes the gedit_plugin_get_type symbol not being available for
    plugins.

 gedit/Makefile.am           |   18 +++++++++---------
 gedit/gedit-app.c           |   12 ++++++------
 gedit/gedit-app.h           |    2 +-
 gedit/gedit-commands-file.c |    8 ++++----
 gedit/gedit-commands.h      |    2 +-
 gedit/gedit.c               |   26 +++++++++++++-------------
 6 files changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index d187b22..9e995d5 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = dialogs smclient
 
 bin_PROGRAMS = gedit
 
-noinst_LTLIBRARIES = libgedit.la
+lib_LTLIBRARIES = libgedit-2.20.la
 
 INCLUDES =								\
 	-I$(top_srcdir)							\
@@ -18,26 +18,26 @@ INCLUDES =								\
 gedit_SOURCES = \
 	gedit.c
 
-gedit_LDADD = libgedit.la $(GEDIT_LIBS) $(EGG_SMCLIENT_LIBS)
+gedit_LDADD = libgedit-2.20.la $(GEDIT_LIBS) $(EGG_SMCLIENT_LIBS)
  
 if PLATFORM_WIN32
 gedit_LDFLAGS = -Wl,--export-all-symbols -mwindows -Wl,--out-implib,libgedit-$(GEDIT_API_VERSION).a
 else
-gedit_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
+gedit_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[^_].*"
 endif
 
 if PLATFORM_OSX
 gedit_LDFLAGS += -framework Carbon
 endif
 
-libgedit_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
+libgedit_2_20_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[^_].*"
 
-libgedit_la_LIBADD = \
+libgedit_2_20_la_LIBADD = \
 	dialogs/libdialogs.la		\
 	smclient/libeggsmclient.la
 
 # GEDIT_LIBS must be the last to ensure correct order on some platforms
-libgedit_la_LIBADD += $(GEDIT_LIBS)
+libgedit_2_20_la_LIBADD += $(GEDIT_LIBS)
 
 BUILT_SOURCES = 			\
 	gedit-enum-types.c		\
@@ -114,7 +114,7 @@ POSIXIO_FILES =
 endif
 
 
-libgedit_la_SOURCES = 			\
+libgedit_2_20_la_SOURCES = 			\
 	$(BUILT_SOURCES)		\
 	$(BACON_FILES)			\
 	$(POSIXIO_FILES)		\
@@ -219,12 +219,12 @@ BACON_DIR=
 endif
 
 if BUILD_MESSAGE_AREA
-libgedit_la_SOURCES += gedit-message-area.c
+libgedit_2_20_la_SOURCES += gedit-message-area.c
 INST_H_FILES += gedit-message-area.h
 endif
 
 if BUILD_SPINNER
-libgedit_la_SOURCES += gedit-spinner.c
+libgedit_2_20_la_SOURCES += gedit-spinner.c
 NOINST_H_FILES += gedit-spinner.h
 endif
 
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index db52a18..07579bc 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -677,7 +677,7 @@ is_in_viewport (GeditWindow  *window,
 }
 
 /**
- * _gedit_app_get_window_in_viewport
+ * gedit_app_get_window_in_viewport
  * @app: the #GeditApp
  * @screen: the #GdkScreen
  * @workspace: the workspace number
@@ -691,11 +691,11 @@ is_in_viewport (GeditWindow  *window,
  * Return value: the #GeditWindow in the given viewport of the given workspace.
  */
 GeditWindow *
-_gedit_app_get_window_in_viewport (GeditApp  *app,
-				   GdkScreen *screen,
-				   gint       workspace,
-				   gint       viewport_x,
-				   gint       viewport_y)
+gedit_app_get_window_in_viewport (GeditApp  *app,
+				  GdkScreen *screen,
+				  gint       workspace,
+				  gint       viewport_x,
+				  gint       viewport_y)
 {
 	GeditWindow *window;
 
diff --git a/gedit/gedit-app.h b/gedit/gedit-app.h
index 5311930..1bd686c 100644
--- a/gedit/gedit-app.h
+++ b/gedit/gedit-app.h
@@ -112,7 +112,7 @@ GeditLockdownMask gedit_app_get_lockdown		(GeditApp *app);
  */
 GeditWindow	*_gedit_app_restore_window		(GeditApp    *app,
 							 const gchar *role);
-GeditWindow	*_gedit_app_get_window_in_viewport	(GeditApp     *app,
+GeditWindow	*gedit_app_get_window_in_viewport	(GeditApp     *app,
 							 GdkScreen    *screen,
 							 gint          workspace,
 							 gint          viewport_x,
diff --git a/gedit/gedit-commands-file.c b/gedit/gedit-commands-file.c
index 23767fc..2e0f4a0 100644
--- a/gedit/gedit-commands-file.c
+++ b/gedit/gedit-commands-file.c
@@ -375,10 +375,10 @@ gedit_commands_load_files (GeditWindow         *window,
  * titled document.
  */
 gint
-_gedit_cmd_load_files_from_prompt (GeditWindow         *window,
-				   GSList              *files,
-				   const GeditEncoding *encoding,
-				   gint                 line_pos)
+gedit_cmd_load_files_from_prompt (GeditWindow         *window,
+				  GSList              *files,
+				  const GeditEncoding *encoding,
+				  gint                 line_pos)
 {
 	gedit_debug (DEBUG_COMMANDS);
 
diff --git a/gedit/gedit-commands.h b/gedit/gedit-commands.h
index 08e7088..3f52af6 100644
--- a/gedit/gedit-commands.h
+++ b/gedit/gedit-commands.h
@@ -61,7 +61,7 @@ void		 gedit_commands_save_all_documents 	(GeditWindow         *window);
  */
 
 /* Create titled documens for non-existing URIs */
-gint		_gedit_cmd_load_files_from_prompt	(GeditWindow         *window,
+gint		gedit_cmd_load_files_from_prompt	(GeditWindow         *window,
 							 GSList              *files,
 							 const GeditEncoding *encoding,
 							 gint                 line_pos);
diff --git a/gedit/gedit.c b/gedit/gedit.c
index 88de0f1..f3bf5e1 100644
--- a/gedit/gedit.c
+++ b/gedit/gedit.c
@@ -354,19 +354,19 @@ on_message_received (const char *message,
 	else
 	{
 		/* get a window in the current workspace (if exists) and raise it */
-		window = _gedit_app_get_window_in_viewport (app,
-							    screen,
-							    workspace,
-							    viewport_x,
-							    viewport_y);
+		window = gedit_app_get_window_in_viewport (app,
+							   screen,
+							   workspace,
+							   viewport_x,
+							   viewport_y);
 	}
 
 	if (file_list != NULL)
 	{
-		_gedit_cmd_load_files_from_prompt (window,
-						   file_list,
-						   encoding,
-						   line_position);
+		gedit_cmd_load_files_from_prompt (window,
+						  file_list,
+						  encoding,
+						  line_position);
 
 		if (new_document_option)
 			gedit_window_create_tab (window, TRUE);
@@ -708,10 +708,10 @@ main (int argc, char *argv[])
 				encoding = gedit_encoding_get_from_charset (encoding_charset);
 		
 			gedit_debug_message (DEBUG_APP, "Load files");
-			_gedit_cmd_load_files_from_prompt (window, 
-							   file_list, 
-							   encoding, 
-							   line_position);
+			gedit_cmd_load_files_from_prompt (window,
+							  file_list,
+							  encoding,
+							  line_position);
 		}
 		else
 		{