Commit a9836add authored by Zeeshan Ali's avatar Zeeshan Ali

lib: Drop symbolic link solution for common files

Instead of keeping symbolic links to src/public-api files, let's just:

1. Make use of the static library we already have in src/public-api.
2. Install the headers from src/public-api from it's own Makefile.

This hopefully fixes the remaining build issues with srcdir != builddir
situation.
parent bacd7d05
......@@ -12,7 +12,7 @@ DOC_MAIN_SGML_FILE=libgeoclue-docs.xml
SCAN_OPTIONS=--ignore-headers=config.h --rebuild-types
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../libgeoclue
DOC_SOURCE_DIR=../../libgeoclue ../../src/public-api
# Used for dependencies
HFILE_GLOB=
......
......@@ -43,8 +43,6 @@ lib_LTLIBRARIES = libgeoclue-2.la
geoclue_includedir = $(includedir)/libgeoclue-$(GEOCLUE_API_VERSION)
geoclue_include_HEADERS = geoclue.h \
gclue-enums.h \
gclue-enum-types.h \
gclue-client.h \
gclue-location.h \
gclue-manager.h \
......@@ -56,19 +54,24 @@ AM_CPPFLAGS = $(LIBGEOCLUE_CFLAGS) \
-DLOCALEDIR="\"$(datadir)/locale\"" \
-DG_LOG_DOMAIN=\""Geoclue"\" \
-DABS_TOP_SRCDIR=\""$(abs_top_srcdir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\"
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-I$(top_srcdir)/src/public-api \
-I$(top_builddir)/src/public-api
ENUMS_HEADER = $(top_srcdir)/src/public-api/gclue-enums.h
ENUMS_LIB = $(top_builddir)/src/public-api/libgeoclue-public-api.la
libgeoclue_2_la_SOURCES = \
gclue-client.c \
gclue-location.c \
gclue-manager.c \
gclue-enum-types.c \
gclue-helpers.c \
$(NULL)
libgeoclue_2_la_LIBADD = \
$(LIBGEOCLUE_LIBS) \
$(LIBS) \
libgeoclue_2_la_LIBADD = \
$(LIBGEOCLUE_LIBS) \
$(LIBS) \
$(ENUMS_LIB) \
$(NULL)
CLEANFILES = $(BUILT_SOURCES) \
......@@ -97,8 +100,11 @@ Geoclue-2.0.gir: $(libgeoclue_2_la_SOURCES) $(geoclue_include_HEADERS)
--pkg-export=libgeoclue-2.0 \
--libtool=$(top_builddir)/libtool \
-I$(srcdir) \
-I$(top_srcdir)/src/public-api \
-I$(top_builddir)/src/public-api \
--c-include='geoclue.h' \
$^ \
$(ENUMS_HEADER) \
$(NULL)
Geoclue-2.0.gir: libgeoclue-2.la $(INTROSPECTION_SCANNER) Makefile.am
......
../src/public-api/gclue-enum-types.c
\ No newline at end of file
../src/public-api/gclue-enum-types.h
\ No newline at end of file
../src/public-api/gclue-enums.h
\ No newline at end of file
......@@ -5,6 +5,11 @@ BUILT_SOURCES = \
gclue-enum-types.c \
$(NULL)
geoclue_includedir = $(includedir)/libgeoclue-$(GEOCLUE_API_VERSION)
geoclue_include_HEADERS = gclue-enums.h \
gclue-enum-types.h \
$(NULL)
AM_CPPFLAGS = $(GEOCLUE_CFLAGS) \
$(WARN_CFLAGS) \
-DLOCALEDIR="\"$(datadir)/locale\"" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment