[gnome-terminal] Revert "build: Add noinst convenience library"
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-terminal] Revert "build: Add noinst convenience library"
- Date: Sun, 11 Oct 2015 14:28:47 +0000 (UTC)
commit df6f98b34b505dd7bb26346b1528c88f0062c90b
Author: Christian Persch <chpe gnome org>
Date: Sun Oct 11 16:28:25 2015 +0200
Revert "build: Add noinst convenience library"
This reverts commit 114a0e18c668199df836729656643c56b43c57ea.
src/Makefile.am | 50 ++++++++++++--------------------------------------
src/server.c | 2 ++
2 files changed, 14 insertions(+), 38 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 0c9d37f..16766d3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,17 +5,16 @@ BUILT_SOURCES =
bin_PROGRAMS = gnome-terminal
libexec_PROGRAMS = gnome-terminal-server
noinst_PROGRAMS =
-noinst_LTLIBRARIES = libterminalserver.la
if WITH_NAUTILUS_EXTENSION
nautilusextension_LTLIBRARIES = libterminal-nautilus.la
endif # WITH_NAUTILUS_EXTENSION
-# Terminal server library
+# Terminal server
dbusservice_DATA = org.gnome.Terminal.service
-libterminalserver_la_built = \
+gnome_terminal_server_built = \
terminal-marshal.c \
terminal-marshal.h \
terminal-type-builtins.c \
@@ -25,13 +24,14 @@ libterminalserver_la_built = \
terminal-resources.c \
terminal-resources.h \
$(NULL)
-BUILT_SOURCES += $(libterminalserver_la_built)
+BUILT_SOURCES += $(gnome_terminal_server_built)
-libterminalserver_la_SOURCES = \
+gnome_terminal_server_SOURCES = \
eggshell.c \
eggshell.h \
profile-editor.c \
profile-editor.h \
+ server.c \
terminal-accels.c \
terminal-accels.h \
terminal-app.c \
@@ -80,24 +80,24 @@ libterminalserver_la_SOURCES = \
terminal-window.h \
$(NULL)
-nodist_libterminalserver_la_SOURCES = $(libterminalserver_la_built)
+nodist_gnome_terminal_server_SOURCES = $(gnome_terminal_server_built)
-libterminalserver_la_CPPFLAGS = \
+gnome_terminal_server_CPPFLAGS = \
-DTERMINAL_COMPILATION \
-DTERM_LOCALEDIR="\"$(datadir)/locale\"" \
-DTERM_HELPDIR="\"$(HELP_DIR)\"" \
-DTERM_LIBEXECDIR="\"$(libexecdir)\"" \
$(AM_CPPFLAGS)
-libterminalserver_la_CFLAGS = \
+gnome_terminal_server_CFLAGS = \
$(TERM_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CFLAGS)
-libterminalserver_la_LDFLAGS = \
+gnome_terminal_server_LDFLAGS = \
$(AM_LDFLAGS)
-libterminalserver_la_LIBADD = \
+gnome_terminal_server_LDADD = \
$(TERM_LIBS)
TYPES_H_FILES = \
@@ -149,32 +149,6 @@ terminal-gdbus-generated.c terminal-gdbus-generated.h: org.gnome.Terminal.xml Ma
terminal-resources.h terminal-resources.c: terminal.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES)
--generate-dependencies --sourcedir $(srcdir) $(srcdir)/terminal.gresource.xml)
$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate
--c-name terminal $<
-# Terminal server
-
-gnome_terminal_server_SOURCES = \
- terminal-app.h \
- terminal-debug.h \
- terminal-i18n.h\
- terminal-libgsystem.h \
- server.c \
- $(NULL)
-
-gnome_terminal_server_CPPFLAGS = \
- -DTERMINAL_COMPILATION \
- $(AM_CPPFLAGS)
-
-gnome_terminal_server_CFLAGS = \
- $(TERM_CFLAGS) \
- $(WARN_CFLAGS) \
- $(AM_CFLAGS)
-
-gnome_terminal_server_LDFLAGS = \
- $(AM_LDFLAGS)
-
-gnome_terminal_server_LDADD = \
- libterminalserver.la \
- $(TERM_LIBS)
-
# Terminal client
if ENABLE_GTERMINAL
@@ -366,12 +340,12 @@ if ENABLE_SEARCH_PROVIDER
searchproviderdir = $(datadir)/gnome-shell/search-providers
dist_searchprovider_DATA = gnome-terminal-search-provider.ini
-libterminalserver_la_built += \
+gnome_terminal_server_built += \
terminal-search-provider-gdbus-generated.c \
terminal-search-provider-gdbus-generated.h \
$(NULL)
-libterminalserver_la_SOURCES += \
+gnome_terminal_server_SOURCES += \
terminal-search-provider.c \
terminal-search-provider.h \
$(NULL)
diff --git a/src/server.c b/src/server.c
index bbe3cfb..af2706d 100644
--- a/src/server.c
+++ b/src/server.c
@@ -37,7 +37,9 @@
#include "terminal-app.h"
#include "terminal-debug.h"
+#include "terminal-gdbus.h"
#include "terminal-i18n.h"
+#include "terminal-defines.h"
#include "terminal-libgsystem.h"
static char *app_id = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]