[vinagre] Change for plugin support
- From: Jonh Wendell <jwendell src gnome org>
- To: svn-commits-list gnome org
- Subject: [vinagre] Change for plugin support
- Date: Mon, 27 Jul 2009 12:00:56 +0000 (UTC)
commit f4f09433f61d8d8ff60f6570eb2702629157b403
Author: Jorge Pereira <jpereiran gmail com>
Date: Thu Jun 25 18:25:14 2009 -0300
Change for plugin support
.gitignore | 3 +++
src/Makefile.am | 34 ++++++++++++++++++++++++----------
2 files changed, 27 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b06104a..0cec5e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,9 @@ src/GNOME_VinagreApplet.server.in
src/Makefile
src/Makefile.in
src/*.o
+src/*.lo
+src/libvinagre.la
+src/.libs/*
src/view/.deps
src/view/*.la
src/view/.libs
diff --git a/src/Makefile.am b/src/Makefile.am
index c35587f..f9a4b15 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,10 +2,6 @@ SUBDIRS = view
NULL =
-##############################
-# The main binary
-##############################
-
INCLUDES = \
-DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\" \
@@ -18,16 +14,19 @@ INCLUDES = \
$(AVAHI_CFLAGS) \
$(NULL)
-bin_PROGRAMS = vinagre
+##############################
+# The main library
+##############################
-vinagre_SOURCES = \
+noinst_LTLIBRARIES = libvinagre.la
+
+libvinagre_la_SOURCES = \
vinagre-commands.c vinagre-commands.h \
vinagre-connect.c vinagre-connect.h \
vinagre-connection.c vinagre-connection.h \
vinagre-vnc-connection.c vinagre-vnc-connection.h \
vinagre-fav.c vinagre-fav.h \
vinagre-bookmarks.c vinagre-bookmarks.h \
- vinagre-main.c \
vinagre-notebook.c vinagre-notebook.h \
vinagre-tab.c vinagre-tab.h \
vinagre-vnc-tab.c vinagre-vnc-tab.h \
@@ -46,14 +45,27 @@ vinagre_SOURCES = \
$(NULL)
if AVAHI
-vinagre_SOURCES += vinagre-mdns.h vinagre-mdns.c
+libvinagre_la_SOURCES += vinagre-mdns.h vinagre-mdns.c
endif
+libvinagre_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
+
+libvinagre_la_LIBADD = view/libview.la
+
+##############################
+# The main binary
+##############################
+
+bin_PROGRAMS = vinagre
+
+vinagre_SOURCES = \
+ vinagre-main.c
+
vinagre_LDADD = \
$(VINAGRE_LIBS) \
$(AVAHI_LIBS) \
$(GTKVNC_LIBS) \
- view/libview.la \
+ libvinagre.la \
$(NULL)
##############################
@@ -153,7 +165,7 @@ if TELEPATHY
INCLUDES += $(TELEPATHY_CFLAGS)
vinagre_LDADD += $(TELEPATHY_LIBS)
-vinagre_SOURCES += \
+libvinagre_la_SOURCES += \
vinagre-tubes-manager.c vinagre-tubes-manager.h \
vinagre-tube-handler.c vinagre-tube-handler.h \
$(NULL)
@@ -173,6 +185,8 @@ DISTCLEANFILES = \
EXTRA_DIST = \
GNOME_VinagreApplet.server.in.in \
+ libvinagre.a \
+ libvinagre.la \
$(NULL)
dist-hook:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]