diff options
| author | Dave Beckett <dave@dajobe.org> | 2013-11-08 08:43:07 -0800 |
|---|---|---|
| committer | Dave Beckett <dave@dajobe.org> | 2013-11-08 08:43:07 -0800 |
| commit | b9bd0316a30b9bc3994934ddcb869c0a4a02a098 (patch) | |
| tree | d4d8778e4efe8732b0918aa0b779dd512c641a4c | |
| parent | 0a3e14299da1b56c07a8897e0aa78b0dc504c002 (diff) | |
| download | raptor-b9bd0316a30b9bc3994934ddcb869c0a4a02a098.tar.gz | |
librdfa.la as a convenience library build fixes
Do not build strtok for librdfa unless needed.
Move -DLIBRDFA_IN_RAPTOR include to librdfa dir only
| -rw-r--r-- | librdfa/Makefile.am | 25 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 24 insertions, 3 deletions
diff --git a/librdfa/Makefile.am b/librdfa/Makefile.am index c13b743c..1be09e4a 100644 --- a/librdfa/Makefile.am +++ b/librdfa/Makefile.am @@ -3,7 +3,9 @@ # Makefile for librdfa convienience library # +if LIBRDFA noinst_LTLIBRARIES = librdfa.la +AM_CPPFLAGS = -DLIBRDFA_IN_RAPTOR -I$(srcdir) librdfa_la_SOURCES = \ context.c \ @@ -14,12 +16,10 @@ lists.c \ namespace.c \ rdfa.c \ rdfa_utils.c \ -strtok_r.c \ subject.c \ triple.c \ rdfa.h \ rdfa_utils.h \ -strtok_r.h \ config.h if NEED_STRTOK_R @@ -32,3 +32,24 @@ endif # Do not need: # mingw32_utils.c # mingw32_utils.h + +else + +EXTRA_DIST = \ +context.c \ +curie.c \ +iri.c \ +language.c \ +lists.c \ +namespace.c \ +rdfa.c \ +rdfa_utils.c \ +strtok_r.c \ +subject.c \ +triple.c \ +rdfa.h \ +rdfa_utils.h \ +strtok_r.h \ +config.h + +endif diff --git a/src/Makefile.am b/src/Makefile.am index 717e8d97..ea977ce7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -165,7 +165,7 @@ endif libraptor2_la_LIBADD = if LIBRDFA -AM_CPPFLAGS += -DLIBRDFA_IN_RAPTOR -I$(top_srcdir)/librdfa +AM_CPPFLAGS += -I$(top_srcdir)/librdfa libraptor2_la_LIBADD += $(top_builddir)/librdfa/librdfa.la endif |