diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2005-01-12 17:42:01 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2005-01-12 17:42:01 +0000 |
| commit | 142e64189fe871c430fa194d9b149ad0a3f1a158 (patch) | |
| tree | 563eb0cafea1aeda69eebd1555865a6a9d8ed870 | |
| parent | d3c7069617f3b7746bb27f339bde0c3afeeaf96c (diff) | |
moved errors.[ch] up; as requested.
| -rw-r--r-- | lasso/Makefile.am | 4 | ||||
| -rw-r--r-- | lasso/errors.c (renamed from lasso/xml/errors.c) | 2 | ||||
| -rw-r--r-- | lasso/errors.h (renamed from lasso/xml/errors.h) | 0 | ||||
| -rw-r--r-- | lasso/xml/Makefile.am | 2 | ||||
| -rw-r--r-- | lasso/xml/xml.h | 2 | ||||
| -rw-r--r-- | swig/Lasso.i | 4 |
6 files changed, 6 insertions, 8 deletions
diff --git a/lasso/Makefile.am b/lasso/Makefile.am index d102b6b3..9c9d8d09 100644 --- a/lasso/Makefile.am +++ b/lasso/Makefile.am @@ -16,10 +16,10 @@ lasso.rc.lo: $(top_srcdir)/win32/lasso.rc lib_LTLIBRARIES = liblasso.la -liblassoinclude_HEADERS = export.h lasso.h lasso_config.h +liblassoinclude_HEADERS = export.h lasso.h lasso_config.h errors.h BUILT_SOURCES = types.c symbols.sym -liblasso_la_SOURCES = lasso.c +liblasso_la_SOURCES = lasso.c errors.c types.c: python $(srcdir)/extract_types.py $(srcdir) diff --git a/lasso/xml/errors.c b/lasso/errors.c index 0270262c..d4d61ddb 100644 --- a/lasso/xml/errors.c +++ b/lasso/errors.c @@ -24,7 +24,7 @@ */ #include <glib/gstrfuncs.h> -#include <lasso/xml/errors.h> +#include <lasso/errors.h> const char* lasso_strerror(int error_code); diff --git a/lasso/xml/errors.h b/lasso/errors.h index e0cc9901..e0cc9901 100644 --- a/lasso/xml/errors.h +++ b/lasso/errors.h diff --git a/lasso/xml/Makefile.am b/lasso/xml/Makefile.am index c1dab400..5b8e976d 100644 --- a/lasso/xml/Makefile.am +++ b/lasso/xml/Makefile.am @@ -10,7 +10,6 @@ noinst_LTLIBRARIES = liblasso-xml.la liblasso_xml_la_SOURCES = \ tools.c \ - errors.c \ xml.c \ disco_credentials.c \ disco_description.c \ @@ -83,7 +82,6 @@ liblasso_xml_la_SOURCES = \ liblassoinclude_HEADERS = \ strings.h \ - errors.h \ xml.h \ disco_credentials.h \ disco_description.h \ diff --git a/lasso/xml/xml.h b/lasso/xml/xml.h index a5b29d9c..8c14cec6 100644 --- a/lasso/xml/xml.h +++ b/lasso/xml/xml.h @@ -40,7 +40,7 @@ extern "C" { #include <libxml/tree.h> #include <lasso/export.h> -#include <lasso/xml/errors.h> +#include <lasso/errors.h> #include <lasso/xml/strings.h> #define LASSO_TYPE_NODE (lasso_node_get_type()) diff --git a/swig/Lasso.i b/swig/Lasso.i index c1281cb8..bcfba415 100644 --- a/swig/Lasso.i +++ b/swig/Lasso.i @@ -911,9 +911,9 @@ typedef enum { #endif %ignore lasso_strerror; -%include "../lasso/xml/errors.h" +%include "../lasso/errors.h" %{ -#include <lasso/xml/errors.h> +#include <lasso/errors.h> %} |