81 lines
2.9 KiB
Diff
81 lines
2.9 KiB
Diff
|
diff -uNr simias.orig/Makefile.am simias/Makefile.am
|
||
|
--- simias.orig/Makefile.am 2009-02-21 15:54:46.573843452 +0100
|
||
|
+++ simias/Makefile.am 2009-02-21 15:55:03.186687971 +0100
|
||
|
@@ -7,7 +7,7 @@
|
||
|
rm -rf `find $(distdir) -name CVS`
|
||
|
rm -rf `find $(distdir) -name ".svn"`
|
||
|
|
||
|
-EXTRA_DIST = iFolder.snk tools/aclocal tools/gsoap external/libflaim external/log4net external/Mono.WebServer
|
||
|
+EXTRA_DIST = iFolder.snk tools/aclocal external/libflaim external/log4net external/Mono.WebServer
|
||
|
|
||
|
all:
|
||
|
|
||
|
diff -uNr simias.orig/src/core/libsimias/Makefile.am simias/src/core/libsimias/Makefile.am
|
||
|
--- simias.orig/src/core/libsimias/Makefile.am 2009-02-21 15:54:46.492830527 +0100
|
||
|
+++ simias/src/core/libsimias/Makefile.am 2009-02-21 15:55:52.874747286 +0100
|
||
|
@@ -6,7 +6,6 @@
|
||
|
dist-hook:
|
||
|
rm -rf `find $(distdir) |grep simiasClientLib.c`
|
||
|
rm -rf `find $(distdir) |grep envC.c`
|
||
|
- rm -rf `find $(distdir) |grep stdsoap2.c`
|
||
|
|
||
|
|
||
|
lib_LTLIBRARIES = libsimias.la
|
||
|
@@ -14,7 +13,7 @@
|
||
|
override CFLAGS =
|
||
|
|
||
|
libsimias_la_SOURCES = \
|
||
|
- envC.c simiasClientLib.c stdsoap2.c simias.c simias.h simiasweb.c simiasweb.h
|
||
|
+ envC.c simiasClientLib.c simias.c simias.h simiasweb.c simiasweb.h
|
||
|
|
||
|
libsimias_la_CFLAGS = \
|
||
|
$(XML2_CFLAGS) -DWITH_NONAMESPACES -DWITH_COOKIES
|
||
|
@@ -22,19 +21,15 @@
|
||
|
libsimias_la_LDFLAGS = \
|
||
|
$(XML2_LIBS)
|
||
|
|
||
|
-envC.c: $(srcdir)/stdsoap2.c
|
||
|
+envC.c:
|
||
|
> $(srcdir)/env.h
|
||
|
- $(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
|
||
|
+ soapcpp2 -c -penv $(srcdir)/env.h
|
||
|
|
||
|
-$(srcdir)/stdsoap2.c:
|
||
|
- cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
|
||
|
- cp $(GSOAP_PATH)/stdsoap2.c $(srcdir)
|
||
|
-
|
||
|
-$(srcdir)/libsimias.h: $(srcdir)/stdsoap2.c $(SIMIAS_WSDL)
|
||
|
- $(GSOAP_PATH)/wsdl2h -c -o $@ $(SIMIAS_WSDL)
|
||
|
+$(srcdir)/libsimias.h: $(SIMIAS_WSDL)
|
||
|
+ wsdl2h -c -o $@ $(SIMIAS_WSDL)
|
||
|
|
||
|
$(srcdir)/simiasClientLib.c: $(srcdir)/libsimias.h
|
||
|
- $(GSOAP_PATH)/soapcpp2 -c -n -psimias $(srcdir)/libsimias.h
|
||
|
+ soapcpp2 -c -n -psimias $(srcdir)/libsimias.h
|
||
|
|
||
|
install-exec-hook:
|
||
|
if !WINDOWS
|
||
|
@@ -46,7 +41,6 @@
|
||
|
$(mkinstalldirs) $(DESTDIR)$(includedir)
|
||
|
$(INSTALL_PROGRAM) simiasStub.h $(DESTDIR)$(includedir)/simias
|
||
|
$(INSTALL_PROGRAM) simias.nsmap $(DESTDIR)$(includedir)/simias
|
||
|
- $(INSTALL_PROGRAM) stdsoap2.h $(DESTDIR)$(includedir)/simias
|
||
|
$(INSTALL_PROGRAM) simiasH.h $(DESTDIR)$(includedir)/simias
|
||
|
$(INSTALL_PROGRAM) simias.h $(DESTDIR)$(includedir)/simias
|
||
|
$(INSTALL_PROGRAM) simiasweb.h $(DESTDIR)$(includedir)/simias
|
||
|
@@ -54,13 +48,12 @@
|
||
|
uninstall-local:
|
||
|
rm -f $(DESTDIR)$(includedir)/simias/simiasStub.h
|
||
|
rm -f $(DESTDIR)$(includedir)/simias/simias.nsmap
|
||
|
- rm -f $(DESTDIR)$(includedir)/simias/stdsoap2.h
|
||
|
rm -f $(DESTDIR)$(includedir)/simias/simiasH.h
|
||
|
rm -f $(DESTDIR)$(includedir)/simias/simias.h
|
||
|
rm -f $(DESTDIR)$(includedir)/simias/simiasweb.h
|
||
|
|
||
|
clean-local:
|
||
|
- rm -f stdsoap2.* *.xml simias.nsmap simiasC* simiasH* simiasS* env* soap*
|
||
|
+ rm -f *.xml simias.nsmap simiasC* simiasH* simiasS* env* soap*
|
||
|
rm -rf $(COMMON_CLEAN_FILES)
|
||
|
|
||
|
distclean-local:
|