Isolated CFLAGS to be used when compiling Lasso in LASSO_CORE_CFLAGS; don't use
those when compiling tests in order to catch errors in headers. Also moved a few things in header files; need more thinking about that.
This commit is contained in:
parent
c613c52c27
commit
ca7ca6c2ce
|
@ -6,7 +6,7 @@ liblassosharpglue_la_SOURCES = \
|
|||
liblassosharpglue_wrap.c
|
||||
|
||||
liblassosharpglue_la_CFLAGS = \
|
||||
$(LASSO_CFLAGS) \
|
||||
$(LASSO_CORE_CFLAGS) \
|
||||
-DSWIG_COBJECT_TYPES
|
||||
|
||||
liblassosharpglue_la_LIBADD = \
|
||||
|
|
|
@ -14,13 +14,13 @@ javalib_LTLIBRARIES = libjlasso.la
|
|||
endif
|
||||
|
||||
jlasso_la_SOURCES = lasso_wrap.c
|
||||
jlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CFLAGS) -I$(top_srcdir)
|
||||
jlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CORE_CFLAGS) -I$(top_srcdir)
|
||||
jlasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
|
||||
jlasso_la_LDFLAGS = -no-undefined -avoid-version -module \
|
||||
-Wl,--add-stdcall-alias
|
||||
|
||||
libjlasso_la_SOURCES = lasso_wrap.c
|
||||
libjlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CFLAGS) -I$(top_srcdir)
|
||||
libjlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CORE_CFLAGS) -I$(top_srcdir)
|
||||
libjlasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
|
||||
libjlasso_la_LDFLAGS = -no-undefined -avoid-version -module
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ SUBDIRS = xml id-ff id-wsf
|
|||
|
||||
liblassoincludedir = $(includedir)/lasso
|
||||
|
||||
INCLUDES = -I$(top_srcdir) $(LASSO_DEFINES) $(LASSO_CFLAGS) -DLASSO_INTERNALS
|
||||
INCLUDES = -I$(top_srcdir) $(LASSO_CORE_CFLAGS)
|
||||
|
||||
## Added to activate libtool 1.5.6 windows resources partial support
|
||||
LTRCCOMPILE = $(LIBTOOL) --tag=RC --mode=compile $(RC) \
|
||||
|
|
|
@ -3,9 +3,7 @@ liblassoincludedir = $(includedir)/lasso/id-ff
|
|||
INCLUDES = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/lasso \
|
||||
$(LASSO_DEFINES) \
|
||||
$(LASSO_CFLAGS) \
|
||||
-DLASSO_INTERNALS \
|
||||
$(LASSO_CORE_CFLAGS) \
|
||||
-DG_LOG_DOMAIN=\"lasso\"
|
||||
|
||||
noinst_LTLIBRARIES = liblasso-id-ff.la
|
||||
|
|
|
@ -3,9 +3,7 @@ liblassoincludedir = $(includedir)/lasso/id-wsf
|
|||
INCLUDES = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/lasso \
|
||||
$(LASSO_DEFINES) \
|
||||
$(LASSO_CFLAGS) \
|
||||
-DLASSO_INTERNALS \
|
||||
$(LASSO_CORE_CFLAGS) \
|
||||
-DG_LOG_DOMAIN=\"lasso\"
|
||||
|
||||
noinst_LTLIBRARIES = liblasso-id-wsf.la
|
||||
|
@ -20,4 +18,4 @@ liblassoinclude_HEADERS = \
|
|||
abstract_service.h \
|
||||
discovery.h \
|
||||
personal_profile_service.h \
|
||||
wsf_profile.h
|
||||
wsf_profile.h
|
||||
|
|
|
@ -34,6 +34,9 @@ extern "C" {
|
|||
# include <windows.h>
|
||||
#endif
|
||||
|
||||
#include <glib.h>
|
||||
#include <glib-object.h>
|
||||
|
||||
#include <lasso/export.h>
|
||||
|
||||
#include <lasso/id-ff/defederation.h>
|
||||
|
|
|
@ -3,9 +3,7 @@ liblassoincludedir = $(includedir)/lasso/xml
|
|||
INCLUDES = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/lasso \
|
||||
$(LASSO_DEFINES) \
|
||||
$(LASSO_CFLAGS) \
|
||||
-DLASSO_INTERNALS \
|
||||
$(LASSO_CORE_CFLAGS) \
|
||||
-DG_LOG_DOMAIN=\"lasso\"
|
||||
|
||||
noinst_LTLIBRARIES = liblasso-xml.la
|
||||
|
|
|
@ -35,11 +35,9 @@
|
|||
#include <xmlsec/base64.h>
|
||||
#include <xmlsec/xmltree.h>
|
||||
|
||||
#include <lasso/xml/xml.h>
|
||||
#include <lasso/xml/tools.h>
|
||||
|
||||
#include <lasso/xml/errors.h>
|
||||
#include <lasso/xml/strings.h>
|
||||
|
||||
|
||||
/**
|
||||
* lasso_build_random_sequence:
|
||||
|
@ -304,7 +302,7 @@ lasso_load_certs_from_pem_certs_chain_file(const char* pem_certs_chain_file)
|
|||
* Return value: a newly allocated query signed or NULL if an error occurs.
|
||||
**/
|
||||
xmlChar*
|
||||
lasso_query_sign(xmlChar *query, lassoSignatureMethod sign_method, const char *private_key_file)
|
||||
lasso_query_sign(xmlChar *query, lassoSignatureMethod sign_method, const char *private_key_file)
|
||||
{
|
||||
BIO *bio = NULL;
|
||||
xmlChar *digest = NULL; /* 160 bit buffer */
|
||||
|
|
|
@ -30,14 +30,8 @@
|
|||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#include <glib.h>
|
||||
#include <lasso/xml/xml.h>
|
||||
#include <xmlsec/crypto.h>
|
||||
#include <lasso/export.h>
|
||||
|
||||
typedef enum {
|
||||
LASSO_SIGNATURE_METHOD_RSA_SHA1 = 1,
|
||||
LASSO_SIGNATURE_METHOD_DSA_SHA1
|
||||
} lassoSignatureMethod;
|
||||
|
||||
typedef enum {
|
||||
LASSO_PEM_FILE_TYPE_UNKNOWN,
|
||||
|
|
|
@ -39,13 +39,10 @@ extern "C" {
|
|||
#include <libxml/uri.h>
|
||||
#include <libxml/tree.h>
|
||||
|
||||
#include <lasso/export.h>
|
||||
#include <lasso/xml/errors.h>
|
||||
#include <lasso/xml/strings.h>
|
||||
|
||||
#ifdef LASSO_INTERNALS
|
||||
#include <lasso/xml/tools.h>
|
||||
#endif
|
||||
|
||||
#define LASSO_TYPE_NODE (lasso_node_get_type())
|
||||
#define LASSO_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_NODE, LassoNode))
|
||||
#define LASSO_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_NODE, LassoNodeClass))
|
||||
|
@ -68,6 +65,11 @@ typedef enum {
|
|||
LASSO_SIGNATURE_TYPE_WITHX509
|
||||
} lassoSignatureType;
|
||||
|
||||
typedef enum {
|
||||
LASSO_SIGNATURE_METHOD_RSA_SHA1 = 1,
|
||||
LASSO_SIGNATURE_METHOD_DSA_SHA1
|
||||
} lassoSignatureMethod;
|
||||
|
||||
typedef struct _LassoNode LassoNode;
|
||||
typedef struct _LassoNodeClass LassoNodeClass;
|
||||
typedef struct _LassoNodeClassData LassoNodeClassData;
|
||||
|
@ -122,6 +124,7 @@ LASSO_EXPORT gint lasso_node_verify_signature(LassoNode *node,
|
|||
|
||||
#ifdef LASSO_INTERNALS
|
||||
#include <lasso/xml/internals.h>
|
||||
#include <lasso/xml/tools.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
SWIG_OUTPUTS = lasso_wrap.c php_lasso.h lasso.php
|
||||
|
||||
php_extension_LTLIBRARIES = lasso.la
|
||||
lasso_la_CFLAGS = $(LASSO_CFLAGS) -I$(top_srcdir) $(PHP_INCLUDES)
|
||||
lasso_la_CFLAGS = $(LASSO_CORE_CFLAGS) -I$(top_srcdir) $(PHP_INCLUDES)
|
||||
lasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version
|
||||
lasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) $(PHP_LDFLAGS)
|
||||
lasso_la_SOURCES = lasso_wrap.c
|
||||
|
|
|
@ -5,7 +5,7 @@ python_DATA = lasso.py
|
|||
python_LTLIBRARIES = _lasso.la
|
||||
|
||||
_lasso_la_SOURCES = lasso_wrap.c
|
||||
_lasso_la_CFLAGS = $(LASSO_CFLAGS) -DSWIG_COBJECT_TYPES $(PY_CFLAGS)
|
||||
_lasso_la_CFLAGS = $(LASSO_CORE_CFLAGS) -DSWIG_COBJECT_TYPES $(PY_CFLAGS)
|
||||
_lasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
|
||||
if DARWIN
|
||||
_lasso_la_LDFLAGS = -no-undefined -module -avoid-version -Wl,-F. -Wl,-F. -bundle -framework Python
|
||||
|
|
|
@ -1,14 +1,13 @@
|
|||
if WITH_TESTS
|
||||
|
||||
TESTS = tests
|
||||
noinst_PROGRAMS = tests
|
||||
noinst_PROGRAMS = tests perfs minitests
|
||||
|
||||
INCLUDES = \
|
||||
-DPACKAGE=\"@PACKAGE@\" \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/lasso \
|
||||
-DTESTSDATADIR=\"$(srcdir)/data/\" \
|
||||
$(LASSO_DEFINES) \
|
||||
$(LASSO_CFLAGS) \
|
||||
$(CHECK_CFLAGS)
|
||||
|
||||
|
@ -17,6 +16,13 @@ tests_LDADD = \
|
|||
$(top_builddir)/lasso/liblasso.la \
|
||||
$(LASSO_LIBS) \
|
||||
$(CHECK_LIBS)
|
||||
|
||||
perfs_SOURCES = perfs.c
|
||||
perfs_LDADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
|
||||
|
||||
minitests_SOURCES = minitests.c
|
||||
minitests_LDADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
|
||||
|
||||
endif
|
||||
|
||||
EXTRA_DIST = tests.c login_tests.c basic_tests.c random_tests.c
|
||||
|
|
Loading…
Reference in New Issue