FS-2746 --resolve large xmlrpc update thanks garmt

This commit is contained in:
Jeff Lenk committed 2012-10-13 11:37:25 -05:00
1 parent 37ecad9903
commit 6b6c83a718
397 files changed
+41821 -33840

No files matched your search

+31 -26
View File
@@ -1,8 +1,8 @@
# Since the programs in this directories are examples for the user, this
# make file should be as ordinary as possible. It should not rely heavily
# on included make files or configuration parameters. It should not use
# libtool. Also, we don't try to build or rebuild the libraries on which
# these programs depend.
# Since the programs in this directory are examples for the user, this make
# file should be as ordinary as possible. It should not rely heavily on
# included make files or configuration parameters. Also, we don't try to
# build or rebuild the libraries on which these programs depend or even
# recognize that they've changed on their own.
ifeq ($(SRCDIR),)
@@ -15,8 +15,8 @@ include $(BLDDIR)/config.mk
default: all
CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
LDFLAGS = $(LADD)
CFLAGS = $(CFLAGS_PERSONAL) $(CADD)
LDFLAGS += $(LADD)
# If this were a real application, working from an installed copy of
# Xmlrpc-c, XMLRPC_C_CONFIG would just be 'xmlrpc-c-config'. It would be
@@ -25,6 +25,7 @@ XMLRPC_C_CONFIG = $(BLDDIR)/xmlrpc-c-config.test
CLIENTPROGS = \
auth_client \
compound_value_client \
synch_client \
xmlrpc_sample_add_client \
xmlrpc_asynch_client \
@@ -37,6 +38,7 @@ SERVERPROGS_CGI = \
xmlrpc_sample_add_server.cgi
SERVERPROGS_ABYSS = \
compound_value_server \
interrupted_server \
xmlrpc_inetd_server \
xmlrpc_socket_server \
@@ -44,15 +46,19 @@ SERVERPROGS_ABYSS = \
xmlrpc_sample_add_server \
xmlrpc_server_validatee \
BASIC_PROGS = \
json \
gen_sample_add_xml \
# Build up PROGS:
PROGS =
PROGS += $(BASIC_PROGS)
ifeq ($(ENABLE_ABYSS_SERVER),yes)
PROGS += $(SERVERPROGS_ABYSS)
endif
PROGS += gen_sample_add_xml
ifeq ($(MUST_BUILD_CLIENT),yes)
PROGS += $(CLIENTPROGS)
endif
@@ -63,17 +69,17 @@ endif
INCLUDES = -I. $(shell $(XMLRPC_C_CONFIG) client abyss-server --cflags)
LDADD_CLIENT = \
$(shell $(XMLRPC_C_CONFIG) client --ldadd)
LIBS_CLIENT = \
$(shell $(XMLRPC_C_CONFIG) client --libs)
LDADD_SERVER_ABYSS = \
$(shell $(XMLRPC_C_CONFIG) abyss-server --ldadd)
LIBS_SERVER_ABYSS = \
$(shell $(XMLRPC_C_CONFIG) abyss-server --libs)
LDADD_SERVER_CGI = \
$(shell $(XMLRPC_C_CONFIG) cgi-server --ldadd)
LIBS_SERVER_CGI = \
$(shell $(XMLRPC_C_CONFIG) cgi-server --libs)
LDADD_BASE = \
$(shell $(XMLRPC_C_CONFIG) --ldadd)
LIBS_BASE = \
$(shell $(XMLRPC_C_CONFIG) --libs)
all: $(PROGS)
@@ -90,16 +96,17 @@ $(BLDDIR)/examples/cpp:
mkdir $@
$(CLIENTPROGS):%:%.o
$(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT)
$(CCLD) -o $@ $^ $(LIBS_CLIENT) $(LDFLAGS)
$(SERVERPROGS_CGI):%.cgi:%_cgi.o
$(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_CGI)
$(CCLD) -o $@ $^ $(LIBS_SERVER_CGI) $(LDFLAGS)
$(SERVERPROGS_ABYSS):%:%.o
$(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS)
$(CCLD) -o $@ $^ $(LIBS_SERVER_ABYSS) $(LDFLAGS)
$(BASIC_PROGS):%:%.o
$(CCLD) -o $@ $^ $(LIBS_BASE) $(LDFLAGS)
gen_sample_add_xml:%:%.o
$(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_BASE)
OBJECTS = $(patsubst %,%.o,$(patsubst %.cgi,%_cgi,$(PROGS)))
@@ -119,11 +126,9 @@ config.h:
xmlrpc_amconfig.h:
$(LN_S) $(BLDDIR)/$@ .
include $(SRCDIR)/common.mk
.PHONY: clean
clean: clean-common
rm -f $(PROGS) config.h xmlrpc_amconfig.h
clean:
rm -f $(PROGS) *.o config.h xmlrpc_amconfig.h
$(MAKE) -C cpp clean
.PHONY: distclean