[gnome-builder/wip/libide] libide: make libide-1.0 an installable library.



commit 7186c7b1815357f4bee1580b7ee8c7d8fc357af9
Author: Christian Hergert <christian hergert me>
Date:   Sun Feb 15 22:17:52 2015 -0800

    libide: make libide-1.0 an installable library.

 .gitignore           |    4 +-
 Makefile.am          |    2 +
 libide/Makefile.am   |   56 +++++++++++++++++++++++++++++++++-----------------
 src/gnome-builder.mk |    4 +-
 tests/tests.mk       |    8 +++---
 tools/Makefile.am    |   20 +++++++++---------
 6 files changed, 57 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b329854..83796c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,8 +22,8 @@ config.h.in~
 config.log
 config.status
 configure
-Ide.gir
-Ide.typelib
+Ide-1.0.gir
+Ide-1.0.typelib
 gnome-builder
 ide-build
 ide-list-devices
diff --git a/Makefile.am b/Makefile.am
index 05468ba..8d3945d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,8 @@ include build/autotools/automake/AutomakeDocs.mk
 
 ACLOCAL_AMFLAGS = -I build/autotools/m4 ${ACLOCAL_FLAGS}
 
+AM_LDFLAGS = -lstdc++
+
 include libide/Makefile.am
 include src/gnome-builder.mk
 include tools/Makefile.am
diff --git a/libide/Makefile.am b/libide/Makefile.am
index 158c80d..4c72e5b 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -1,8 +1,8 @@
 include libide/editorconfig/libeditorconfig/Makefile.am
 
-noinst_LTLIBRARIES += libide.la
+lib_LTLIBRARIES += libide-1.0.la
 
-libide_la_public_sources = \
+libide_1_0_la_public_sources = \
        libide/autotools/ide-autotools-build-system.c \
        libide/autotools/ide-autotools-build-system.h \
        libide/autotools/ide-autotools-build-task.c \
@@ -136,8 +136,8 @@ libide_la_public_sources = \
        libide/local/ide-local-device.h \
        $(NULL)
 
-libide_la_SOURCES = \
-       $(libide_la_public_sources) \
+libide_1_0_la_SOURCES = \
+       $(libide_1_0_la_public_sources) \
        libide/editorconfig/editorconfig-glib.c \
        libide/editorconfig/editorconfig-glib.h \
        libide/gca/gca-diagnostics.c \
@@ -159,7 +159,7 @@ libide_la_SOURCES = \
        libide/tasks/ide-load-directory-task.h \
        $(NULL)
 
-libide_la_CFLAGS = \
+libide_1_0_la_includes = \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/libide/autotools \
        -I$(top_srcdir)/libide/c \
@@ -173,18 +173,36 @@ libide_la_CFLAGS = \
        -I$(top_srcdir)/libide/gsettings \
        -I$(top_srcdir)/libide/local \
        -I$(top_srcdir)/libide/tasks \
-       $(LIBIDE_CFLAGS)
+       $(NULL)
+
+libide_1_0_la_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       $(libide_1_0_la_includes) \
+       $(NULL)
+
+libide_1_0_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
+       $(libide_1_0_la_includes) \
+       $(NULL)
+
+libide_1_0_la_CXXFLAGS = \
+       $(AM_CXXFLAGS) \
+       $(LIBIDE_CFLAGS) \
+       $(libide_1_0_la_includes) \
+       $(NULL)
 
-libide_la_CXXFLAGS = \
-       $(libide_la_CFLAGS) \
+libide_1_0_la_LDFLAGS = \
+       -avoid-version \
+       -no-undefined \
+       -export-symbols-regex '^ide_.*' \
        $(NULL)
 
-libide_la_LIBADD = \
+libide_1_0_la_LIBADD = \
        $(CLANG_LDFLAGS) \
        $(LIBIDE_LIBS) \
        -lclang \
        libeditorconfig.la \
-       -lstdc++ \
        $(NULL)
 
 
@@ -195,18 +213,18 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_srcdir)/libide --warn-all
 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)/libide
 
 if HAVE_INTROSPECTION
-introspection_sources = $(libide_la_public_sources)
-
-Ide.gir: libide.la
-Ide_gir_INCLUDES = Gio-2.0 GtkSource-3.0 Ggit-1.0
-Ide_gir_CFLAGS = $(libide_la_CFLAGS)
-Ide_gir_LIBS = libide.la
-Ide_gir_FILES = $(introspection_sources)
-Ide_gir_SCANNERFLAGS = \
+introspection_sources = $(libide_1_0_la_public_sources)
+
+Ide-1.0.gir: libide.la
+Ide_1_0_gir_INCLUDES = Gio-2.0 GtkSource-3.0 Ggit-1.0
+Ide_1_0_gir_CFLAGS = $(libide_1_0_la_CFLAGS)
+Ide_1_0_gir_LIBS = libide-1.0.la
+Ide_1_0_gir_FILES = $(introspection_sources)
+Ide_1_0_gir_SCANNERFLAGS = \
        --c-include="ide.h" \
        -n Ide \
        $(NULL)
-INTROSPECTION_GIRS += Ide.gir
+INTROSPECTION_GIRS += Ide-1.0.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/src/gnome-builder.mk b/src/gnome-builder.mk
index e653a6f..fac1bf9 100644
--- a/src/gnome-builder.mk
+++ b/src/gnome-builder.mk
@@ -220,7 +220,7 @@ libgnome_builder_la_SOURCES = \
 
 libgnome_builder_la_LIBADD = \
        $(BUILDER_LIBS) \
-       libide.la \
+       libide-1.0.la \
        -lm
 
 libgnome_builder_la_CFLAGS = \
@@ -271,7 +271,7 @@ endif
 gnome_builder_SOURCES = src/main.c
 gnome_builder_CFLAGS = $(libgnome_builder_la_CFLAGS)
 gnome_builder_LDADD = \
-       libide.la \
+       libide-1.0.la \
        libgnome-builder.la \
        $(NULL)
 
diff --git a/tests/tests.mk b/tests/tests.mk
index 8ed9652..40f21fa 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -16,18 +16,18 @@ noinst_PROGRAMS += test-ide-context
 TESTS += test-ide-context
 test_ide_context_SOURCES = tests/test-ide-context.c
 test_ide_context_CFLAGS = \
-       $(libide_la_CFLAGS) \
+       $(libide_1_0_la_CFLAGS) \
        -DTEST_DATA_DIR="\"$(top_srcdir)/tests/data\""
-test_ide_context_LDADD = libide.la
+test_ide_context_LDADD = libide-1.0.la
 
 
 noinst_PROGRAMS += test-ide-back-forward-list
 TESTS += test-ide-back-forward-list
 test_ide_back_forward_list_SOURCES = tests/test-ide-back-forward-list.c
 test_ide_back_forward_list_CFLAGS = \
-       $(libide_la_CFLAGS) \
+       $(libide_1_0_la_CFLAGS) \
        -DTEST_DATA_DIR="\"$(top_srcdir)/tests/data\""
-test_ide_back_forward_list_LDADD = libide.la
+test_ide_back_forward_list_LDADD = libide-1.0.la
 
 
 EXTRA_DIST += \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 632e513..d6a091b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,25 +1,25 @@
 
 noinst_PROGRAMS += ide-build
 ide_build_SOURCES = tools/ide-build.c
-ide_build_CFLAGS = $(libide_la_CFLAGS)
-ide_build_LDADD = libide.la
+ide_build_CFLAGS = $(libide_1_0_la_CFLAGS)
+ide_build_LDADD = libide-1.0.la
 
 noinst_PROGRAMS += ide-list-file-settings
 ide_list_file_settings_SOURCES = tools/ide-list-file-settings.c
-ide_list_file_settings_CFLAGS = $(libide_la_CFLAGS)
-ide_list_file_settings_LDADD = libide.la
+ide_list_file_settings_CFLAGS = $(libide_1_0_la_CFLAGS)
+ide_list_file_settings_LDADD = libide-1.0.la
 
 noinst_PROGRAMS += ide-list-devices
 ide_list_devices_SOURCES = tools/ide-list-devices.c
-ide_list_devices_CFLAGS = $(libide_la_CFLAGS)
-ide_list_devices_LDADD = libide.la
+ide_list_devices_CFLAGS = $(libide_1_0_la_CFLAGS)
+ide_list_devices_LDADD = libide-1.0.la
 
 noinst_PROGRAMS += ide-list-diagnostics
 ide_list_diagnostics_SOURCES = tools/ide-list-diagnostics.c
-ide_list_diagnostics_CFLAGS = $(libide_la_CFLAGS)
-ide_list_diagnostics_LDADD = libide.la
+ide_list_diagnostics_CFLAGS = $(libide_1_0_la_CFLAGS)
+ide_list_diagnostics_LDADD = libide-1.0.la
 
 noinst_PROGRAMS += ide-list-files
 ide_list_files_SOURCES = tools/ide-list-files.c
-ide_list_files_CFLAGS = $(libide_la_CFLAGS)
-ide_list_files_LDADD = libide.la
+ide_list_files_CFLAGS = $(libide_1_0_la_CFLAGS)
+ide_list_files_LDADD = libide-1.0.la


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