[polari] build: Rename variable



commit 4a60bf6283df8462fcf8f735149690d4b6a551de
Author: Florian Müllner <fmuellner gnome org>
Date:   Sat Oct 15 00:32:36 2016 +0200

    build: Rename variable
    
    We install both a (private) library and an executable called 'polari'.
    For now, the executable is a symlink to a script rather than a compiled
    binary, so we use the POLARI variable for the library's dependencies.
    As we are about to change that, rename it to LIBPOLARI to free the name
    for the executable.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=773293

 configure.ac        |    2 +-
 src/Makefile-lib.am |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d9fabe9..9446af1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ LT_INIT([disable-static])
 
 GLIB_GSETTINGS
 
-PKG_CHECK_MODULES(POLARI,
+PKG_CHECK_MODULES(LIBPOLARI,
                   gio-2.0 >= 2.43.4
                   gtk+-3.0 >= 3.21.6
                   telepathy-glib);
diff --git a/src/Makefile-lib.am b/src/Makefile-lib.am
index 6b6886a..44d62c3 100644
--- a/src/Makefile-lib.am
+++ b/src/Makefile-lib.am
@@ -14,8 +14,8 @@ libpolari_sources = \
 
 libpolari_1_0_la_SOURCES = $(libpolari_headers) $(libpolari_sources)
 
-libpolari_1_0_la_LIBADD = $(POLARI_LIBS)
-libpolari_1_0_la_CFLAGS = $(POLARI_CFLAGS) $(WARN_CFLAGS) \
+libpolari_1_0_la_LIBADD = $(LIBPOLARI_LIBS)
+libpolari_1_0_la_CFLAGS = $(LIBPOLARI_CFLAGS) $(WARN_CFLAGS) \
        -DG_LOG_USE_STRUCTURED -DG_LOG_DOMAIN=\"Polari\"
 libpolari_1_0_la_LDFLAGS = -avoid-version $(WARN_LDFLAGS)
 
@@ -25,7 +25,7 @@ Polari-1.0.gir: libpolari-1.0.la Makefile
 Polari_1_0_gir_NAMESPACE = Polari
 Polari_1_0_gir_VERSION = 1.0
 Polari_1_0_gir_LIBS = libpolari-1.0.la
-Polari_1_0_gir_CFLAGS = $(POLARI_CFLAGS)
+Polari_1_0_gir_CFLAGS = $(LIBPOLARI_CFLAGS)
 Polari_1_0_gir_FILES = $(libpolari_headers) $(libpolari_sources)
 Polari_1_0_gir_SCANNERFLAGS = --warn-all --symbol-prefix=polari --identifier-prefix=Polari
 Polari_1_0_gir_INCLUDES =  \


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