Hi all,
Currently some files in the samples directory are not included in the
binary distribution. Since we keep a seperate build system for
samples, it's sane to add the whole sample directory to the binary
distribution. A patch to do this is attached. Please review and apply.
Thanks.
~sanjaya
--
http://sanjaya.8k.com
Index: server/notify/Makefile.am
===================================================================
--- server/notify/Makefile.am (revision 389779)
+++ server/notify/Makefile.am (working copy)
@@ -1,7 +1,7 @@
prglibdir=$(prefix)/services/notify
samplesdir=$(prefix)/samples/server/notify
prglib_LTLIBRARIES = libnotify.la
-samples_DATA=notify.c notify_skeleton.c notify.h services.xml
+samples_DATA=notify.c notify_skeleton.c notify.h services.xml Makefile.am
prglib_DATA= services.xml
EXTRA_DIST = services.xml
noinst_HEADERS = notify.h
Index: server/math/Makefile.am
===================================================================
--- server/math/Makefile.am (revision 389779)
+++ server/math/Makefile.am (working copy)
@@ -1,7 +1,7 @@
prglibdir=$(prefix)/services/math
samplesdir=$(prefix)/samples/server/math
prglib_LTLIBRARIES = libmath.la
-samples_DATA=services.xml math.h math.c math_skeleton.c
+samples_DATA=services.xml math.h math.c math_skeleton.c Makefile.am
prglib_DATA=services.xml
EXTRA_DIST = services.xml
noinst_HEADERS = math.h
Index: server/Makefile.am
===================================================================
--- server/Makefile.am (revision 389779)
+++ server/Makefile.am (working copy)
@@ -1,2 +1,5 @@
+samplesdir=$(prefix)/samples/server
SUBDIRS = echo math notify
EXTRA_DIST = axis2.xml
+samples_DATA= axis2.log axis2.xml Makefile.am
+
Index: server/echo/Makefile.am
===================================================================
--- server/echo/Makefile.am (revision 389779)
+++ server/echo/Makefile.am (working copy)
@@ -1,7 +1,7 @@
prglibdir=$(prefix)/services/echo
samplesdir=$(prefix)/samples/server/echo
prglib_LTLIBRARIES = libecho.la
-samples_DATA=echo.c echo_skeleton.c echo.h services.xml
+samples_DATA=echo.c echo_skeleton.c echo.h services.xml Makefile.am
prglib_DATA= services.xml
EXTRA_DIST = services.xml
noinst_HEADERS = echo.h
Index: Makefile.am
===================================================================
--- Makefile.am (revision 389779)
+++ Makefile.am (working copy)
@@ -1 +1,3 @@
+samplesdir=$(prefix)/samples
+samples_DATA=AUTHORS autogen.sh ChangeLog configure.ac Makefile.am NEWS README
SUBDIRS = server client
Index: client/echo_non_blocking/Makefile.am
===================================================================
--- client/echo_non_blocking/Makefile.am (revision 389779)
+++ client/echo_non_blocking/Makefile.am (working copy)
@@ -4,7 +4,7 @@
samplesdir=$(prefix)/samples/client/echo_non_blocking
-samples_DATA=echo_client.c
+samples_DATA=echo_client.c echo_client.bak Makefile.am README.txt
echo_non_blocking_SOURCES = echo_client.c
echo_non_blocking_LDADD = \
Index: client/addr_echo/Makefile.am
===================================================================
--- client/addr_echo/Makefile.am (revision 389779)
+++ client/addr_echo/Makefile.am (working copy)
@@ -1,7 +1,7 @@
prgbindir=$(prefix)/bin/samples
prgbin_PROGRAMS = addr_echo
samplesdir=$(prefix)/samples/client/addr_echo
-samples_DATA=echo_client.c
+samples_DATA=echo_client.c README.txt Makefile.am
addr_echo_SOURCES = echo_client.c
addr_echo_LDADD = \
Index: client/notify/Makefile.am
===================================================================
--- client/notify/Makefile.am (revision 389779)
+++ client/notify/Makefile.am (working copy)
@@ -1,7 +1,7 @@
prgbindir=$(prefix)/bin/samples
prgbin_PROGRAMS = notify
samplesdir=$(prefix)/samples/client/notify
-samples_DATA=notify_client.c
+samples_DATA=notify_client.c Makefile.am
notify_SOURCES = notify_client.c
notify_LDADD = \
Index: client/math/Makefile.am
===================================================================
--- client/math/Makefile.am (revision 389779)
+++ client/math/Makefile.am (working copy)
@@ -2,7 +2,7 @@
samplesdir=$(prefix)/samples/client/math
prgbin_PROGRAMS = math
noinst_HEADERS = axis2_math_stub.h
-samples_DATA=axis2_math_stub.c math_client.c axis2_math_stub.h
+samples_DATA=axis2_math_stub.c math_client.c axis2_math_stub.h Makefile.am
math_SOURCES = axis2_math_stub.c \
math_client.c
Index: client/Makefile.am
===================================================================
--- client/Makefile.am (revision 389779)
+++ client/Makefile.am (working copy)
@@ -1 +1,4 @@
+samplesdir=$(prefix)/samples/client
+samples_DATA=Makefile.am
SUBDIRS = echo math addr_echo google echo_non_blocking notify $(DICLIENT_DIR)
+
Index: client/diclient/Makefile.am
===================================================================
--- client/diclient/Makefile.am (revision 389779)
+++ client/diclient/Makefile.am (working copy)
@@ -1,7 +1,7 @@
prgbindir=$(prefix)/bin/samples
prgbin_PROGRAMS = echo_client
samplesdir=$(prefix)/samples/client/diclient
-samples_DATA=echo_client.c
+samples_DATA=echo_client.c di_client.h Makefile.am README
echo_client_SOURCES = echo_client.c
echo_client_LDADD = \
-laxis2_util \
Index: client/google/Makefile.am
===================================================================
--- client/google/Makefile.am (revision 389779)
+++ client/google/Makefile.am (working copy)
@@ -1,7 +1,7 @@
prgbindir=$(prefix)/bin/samples
samplesdir=$(prefix)/samples/client/google
prgbin_PROGRAMS = google
-samples_DATA=google_client.c
+samples_DATA=google_client.c Makefile.am README.txt
google_SOURCES = google_client.c
google_LDADD = $(LDFLAGS) \
Index: client/echo/Makefile.am
===================================================================
--- client/echo/Makefile.am (revision 389779)
+++ client/echo/Makefile.am (working copy)
@@ -2,7 +2,8 @@
samplesdir=$(prefix)/samples/client/echo
prgbin_PROGRAMS = echo
noinst_HEADERS = axis2_echo_stub.h
-samples_DATA=axis2_echo_stub.c echo_client.c axis2_echo_stub.h
+samples_DATA=axis2_echo_stub.c echo_client.c axis2_echo_stub.h Makefile.am
+
echo_SOURCES = axis2_echo_stub.c \
echo_client.c