[gedit] Drop libgedit-private.so



commit 33fefa2a923036803fa6bb2935d7c4446cce89ba
Author: Paolo Borelli <pborelli gnome org>
Date:   Fri Apr 4 20:40:41 2014 +0200

    Drop libgedit-private.so
    
    Having a noinst libgedit and an installed libgedit-private.so does
    not really make much sense. Let's just install libgedit.so, it is in
    a pkg specific dir anyway with no stability guarantee and (at least
    on windows) C plugins need to actually link to it

 gedit/Makefile.am |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index f1c3c7c..66ed450 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -1,7 +1,6 @@
 bin_PROGRAMS += gedit/gedit
 
-noinst_LTLIBRARIES += gedit/libgedit.la
-pkglib_LTLIBRARIES += gedit/libgedit-private.la
+pkglib_LTLIBRARIES += gedit/libgedit.la
 
 gedit_common_cppflags =                                                        \
        -I$(top_srcdir)                                                 \
@@ -23,7 +22,6 @@ gedit_gedit_CFLAGS = $(gedit_common_cflags)
 
 gedit_gedit_LDADD =                    \
        gedit/libgedit.la               \
-       gedit/libgedit-private.la       \
        $(GEDIT_LIBS)                   \
        $(GTK_MAC_LIBS)                 \
        $(INTROSPECTION_LIBS)
@@ -38,7 +36,7 @@ endif
 
 gedit_libgedit_la_CPPFLAGS = $(gedit_common_cppflags)
 gedit_libgedit_la_CFLAGS = $(gedit_common_cflags)
-gedit_libgedit_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
+gedit_libgedit_la_LDFLAGS = -avoid-version -export-dynamic -no-undefined -export-symbols-regex "^[^_].*"
 
 # GEDIT_LIBS must be the last to ensure correct order on some platforms
 gedit_libgedit_la_LIBADD =                     \
@@ -46,11 +44,6 @@ gedit_libgedit_la_LIBADD =                   \
        $(GEDIT_LIBS)                           \
        $(GTK_MAC_LIBS)
 
-gedit_libgedit_private_la_LIBADD = gedit/libgedit.la $(GEDIT_LIBS)
-gedit_libgedit_private_la_LDFLAGS = -avoid-version
-gedit_libgedit_private_la_CPPFLAGS = $(gedit_common_cppflags)
-gedit_libgedit_private_la_CFLAGS = $(gedit_common_cflags)
-
 # Mac OSX convenience library and ldflags
 if OS_OSX
 noinst_LTLIBRARIES += gedit/libosx.la
@@ -164,15 +157,13 @@ endif
 gedit_headerdir = $(prefix)/include/gedit-$(GEDIT_API_VERSION)/gedit
 gedit_header_HEADERS = $(gedit_INST_H_FILES)
 
-gedit_libgedit_private_la_SOURCES =            \
+gedit_libgedit_c_files =                       \
+       gedit/gedit-app.c                       \
        gedit/gedit-app-activatable.c           \
        gedit/gedit-view-activatable.c          \
        gedit/gedit-window-activatable.c        \
        gedit/gedit-menu-extension.c            \
-       gedit/gedit-resources.c
-
-gedit_libgedit_c_files =                       \
-       gedit/gedit-app.c                       \
+       gedit/gedit-resources.c                 \
        gedit/gedit-close-confirmation-dialog.c \
        gedit/gedit-commands-documents.c        \
        gedit/gedit-commands-edit.c             \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]