[gtksourceview/wip/loader-saver: 9/31] build: rename helper library private -> core
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview/wip/loader-saver: 9/31] build: rename helper library private -> core
- Date: Sun, 6 Jul 2014 13:22:04 +0000 (UTC)
commit 0bb3ad6f918370c649bcc8b143ae31d15a5f20a6
Author: Sébastien Wilmet <swilmet gnome org>
Date: Wed Jun 4 14:47:49 2014 +0200
build: rename helper library private -> core
gtksourceview/Makefile.am | 20 ++++++++++----------
tests/Makefile.am | 34 +++++++++++++++-------------------
2 files changed, 25 insertions(+), 29 deletions(-)
---
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index 4a5476d..6444677 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -52,7 +52,7 @@ libgtksourceview_headers = \
gtksourceutils.h \
gtksourceview.h
-libgtksourceview_private_headers = \
+libgtksourceview_private_headers = \
gtksourcebuffer-private.h \
gtksourcebufferinputstream.h \
gtksourcebufferoutputstream.h \
@@ -76,7 +76,7 @@ libgtksourceview_private_headers = \
gtksourceview-utils.h \
gtktextregion.h
-libgtksourceview_private_c_files = \
+libgtksourceview_private_c_files = \
gtksourcebufferinputstream.c \
gtksourcebufferoutputstream.c \
gtksourcecompletioncontainer.c \
@@ -96,7 +96,7 @@ libgtksourceview_private_c_files = \
gtksourceview-utils.c \
gtktextregion.c
-libgtksourceview_c_files = \
+libgtksourceview_c_files = \
gtksourcebuffer.c \
gtksourcecompletion.c \
gtksourcecompletioncontext.c \
@@ -124,23 +124,23 @@ libgtksourceview_c_files = \
gtksourceutils.c \
gtksourceview.c
-# Split in a helper library for unit tests
-noinst_LTLIBRARIES = libgtksourceview-private.la
+# Split in a helper library, so the private functions can be used in unit tests.
+noinst_LTLIBRARIES = libgtksourceview-core.la
-libgtksourceview_private_la_SOURCES = \
+libgtksourceview_core_la_SOURCES = \
$(libgtksourceview_private_c_files) \
$(libgtksourceview_private_headers) \
$(libgtksourceview_c_files) \
$(libgtksourceview_headers)
# do not distribute generated files
-nodist_libgtksourceview_private_la_SOURCES = \
+nodist_libgtksourceview_core_la_SOURCES = \
$(BUILT_SOURCES)
-libgtksourceview_private_la_CFLAGS = \
+libgtksourceview_core_la_CFLAGS = \
$(CODE_COVERAGE_CFLAGS)
-libgtksourceview_private_la_LDFLAGS = \
+libgtksourceview_core_la_LDFLAGS = \
-no-undefined \
$(CODE_COVERAGE_LDFLAGS)
@@ -150,7 +150,7 @@ lib_LTLIBRARIES = libgtksourceview-3.0.la
libgtksourceview_3_0_la_SOURCES =
libgtksourceview_3_0_la_LIBADD = \
- libgtksourceview-private.la \
+ libgtksourceview-core.la \
completion-providers/words/libgtksourcecompletionwords.la \
$(DEP_LIBS) $(GTK_MAC_LIBS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0e783cb..e89dd1c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -70,25 +70,22 @@ test_buffer_LDADD = \
UNIT_TEST_PROGS += test-buffer-input-stream
test_buffer_input_stream_SOURCES = test-buffer-input-stream.c
-test_buffer_input_stream_LDADD = \
- $(top_builddir)/gtksourceview/libgtksourceview-private.la \
- $(top_builddir)/gtksourceview/libgtksourceview-3.0.la \
- $(DEP_LIBS) \
+test_buffer_input_stream_LDADD = \
+ $(top_builddir)/gtksourceview/libgtksourceview-core.la \
+ $(DEP_LIBS) \
$(TESTS_LIBS)
UNIT_TEST_PROGS += test-buffer-output-stream
test_buffer_output_stream_SOURCES = test-buffer-output-stream.c
-test_buffer_output_stream_LDADD = \
- $(top_builddir)/gtksourceview/libgtksourceview-private.la \
- $(top_builddir)/gtksourceview/libgtksourceview-3.0.la \
- $(DEP_LIBS) \
+test_buffer_output_stream_LDADD = \
+ $(top_builddir)/gtksourceview/libgtksourceview-core.la \
+ $(DEP_LIBS) \
$(TESTS_LIBS)
UNIT_TEST_PROGS += test-completion-model
test_completion_model_SOURCES = test-completion-model.c
test_completion_model_LDADD = \
- $(top_builddir)/gtksourceview/libgtksourceview-3.0.la \
- $(top_builddir)/gtksourceview/libgtksourceview-private.la \
+ $(top_builddir)/gtksourceview/libgtksourceview-core.la \
$(DEP_LIBS) \
$(TESTS_LIBS)
@@ -148,24 +145,23 @@ test_printcompositor_LDADD = \
UNIT_TEST_PROGS += test-regex
test_regex_SOURCES = test-regex.c
test_regex_LDADD = \
- $(top_builddir)/gtksourceview/libgtksourceview-private.la \
- $(DEP_LIBS) \
- $(GTK_MAC_LIBS) \
+ $(top_builddir)/gtksourceview/libgtksourceview-core.la \
+ $(DEP_LIBS) \
+ $(GTK_MAC_LIBS) \
$(TESTS_LIBS)
UNIT_TEST_PROGS += test-region
test_region_SOURCES = test-region.c
test_region_LDADD = \
- $(top_builddir)/gtksourceview/libgtksourceview-private.la \
- $(DEP_LIBS) \
+ $(top_builddir)/gtksourceview/libgtksourceview-core.la \
+ $(DEP_LIBS) \
$(TESTS_LIBS)
UNIT_TEST_PROGS += test-search-context
test_search_context_SOURCES = test-search-context.c
-test_search_context_LDADD = \
- $(top_builddir)/gtksourceview/libgtksourceview-3.0.la \
- $(top_builddir)/gtksourceview/libgtksourceview-private.la \
- $(DEP_LIBS) \
+test_search_context_LDADD = \
+ $(top_builddir)/gtksourceview/libgtksourceview-core.la \
+ $(DEP_LIBS) \
$(TESTS_LIBS)
UNIT_TEST_PROGS += test-styleschememanager
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]