summaryrefslogtreecommitdiffstats
path: root/wsdl2c
diff options
context:
space:
mode:
Diffstat (limited to 'wsdl2c')
-rwxr-xr-xwsdl2c/Makefile.am9
-rwxr-xr-xwsdl2c/wsdl2c.c25
2 files changed, 10 insertions, 24 deletions
diff --git a/wsdl2c/Makefile.am b/wsdl2c/Makefile.am
index 4feb2c3..e045020 100755
--- a/wsdl2c/Makefile.am
+++ b/wsdl2c/Makefile.am
@@ -2,7 +2,14 @@ bin_PROGRAMS=wsdl2c
INCLUDES=$(LIBXML_CFLAGS) -I$(top_srcdir)
LDFLAGS=$(LIBXML_LIBS)
+
+xsd2c_root= $(top_srcdir)/xsd2c
+xsd2c_objs=../xsd2c/util.o \
+../xsd2c/formatter.o \
+../xsd2c/obj.o \
+../xsd2c/xsd2c.o \
+../xsd2c/tr.o
wsdl2c_SOURCES=wsdl2c.c
-wsdl2c_LDFLAGS=$(LDFLAGS)
+wsdl2c_LDFLAGS=$(LDFLAGS) $(xsd2c_objs)
diff --git a/wsdl2c/wsdl2c.c b/wsdl2c/wsdl2c.c
index 67395af..85daa23 100755
--- a/wsdl2c/wsdl2c.c
+++ b/wsdl2c/wsdl2c.c
@@ -1,29 +1,8 @@
#include <libxml/xpath.h>
+#include <xsd2c/xsd2c.h>
+#include <xsd2c/util.h> /* parseNS */
-int parseNS(const char* fullname, char *ns, char *name)
-{
- int len, i, found;
-
- if (fullname == NULL || ns == NULL || name == NULL) return 0;
-
- len = strlen(fullname);
-
- found = 0;
- for (i = len - 1; i > 0; i--)
- {
- if (fullname[i] == ':') { found = 1; break; }
- }
-
- if (found) strncpy(ns, fullname, i);
- else ns[0] = '\0';
-
- strcpy(name,
- (fullname[i] == ':')?
- (&fullname[i+1]):(&fullname[i]));
-
- return 1;
-}
xmlXPathObjectPtr xpath_eval(xmlDocPtr doc, const char *xpath)
{