FS-2746 --resolve large xmlrpc update thanks garmt

This commit is contained in:
Jeff Lenk
2012-10-13 11:37:25 -05:00
parent 37ecad9903
commit 6b6c83a718
397 changed files with 41822 additions and 33841 deletions

View File

@@ -15,8 +15,8 @@ include $(BLDDIR)/config.mk
default: all
CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
LDFLAGS = $(LADD)
CXXFLAGS = $(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
@@ -24,10 +24,14 @@ LDFLAGS = $(LADD)
XMLRPC_C_CONFIG = $(BLDDIR)/xmlrpc-c-config.test
SERVERPROGS_CGI = \
xmlrpc_sample_add_server.cgi
SERVERPROGS_ABYSS = \
xmlrpc_inetd_server \
xmlrpc_loop_server \
xmlrpc_sample_add_server \
callinfo_abyss_server \
CLIENTPROGS = \
xmlrpc_sample_add_client \
@@ -45,7 +49,11 @@ ifeq ($(MUST_BUILD_CLIENT),yes)
PROGS += $(CLIENTPROGS)
endif
PROGS += pstream_inetd_server
ifeq ($(ENABLE_CGI_SERVER),yes)
PROGS += $(SERVERPROGS_CGI)
endif
PROGS += pstream_inetd_server pstream_serial_server
ifeq ($(MUST_BUILD_CLIENT),yes)
PROGS += pstream_client
@@ -53,37 +61,43 @@ endif
INCLUDES = -I. $(shell $(XMLRPC_C_CONFIG) c++2 client abyss-server --cflags)
LDADD_SERVER_ABYSS = \
$(shell $(XMLRPC_C_CONFIG) c++2 abyss-server --ldadd)
LIBS_SERVER_ABYSS = \
$(shell $(XMLRPC_C_CONFIG) c++2 abyss-server --libs)
LDADD_CLIENT = \
$(shell $(XMLRPC_C_CONFIG) c++2 client --ldadd)
LIBS_SERVER_CGI = \
$(shell $(XMLRPC_C_CONFIG) c++2 cgi-server --libs)
LDADD_BASE = \
$(shell $(XMLRPC_C_CONFIG) c++2 --ldadd)
LIBS_CLIENT = \
$(shell $(XMLRPC_C_CONFIG) c++2 client --libs)
LIBS_BASE = \
$(shell $(XMLRPC_C_CONFIG) c++2 --libs)
all: $(PROGS)
$(SERVERPROGS_CGI):%.cgi:%_cgi.o
$(CXXLD) -o $@ $^ $(LIBS_SERVER_CGI) $(LDFLAGS)
$(SERVERPROGS_ABYSS):%:%.o
$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS)
$(CXXLD) -o $@ $^ $(LIBS_SERVER_ABYSS) $(LDFLAGS)
$(CLIENTPROGS):%:%.o
$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT)
$(CXXLD) -o $@ $^ $(LIBS_CLIENT) $(LDFLAGS)
LDADD_PSTREAM_CLIENT = \
$(shell $(XMLRPC_C_CONFIG) c++2 client --ldadd)
LIBS_PSTREAM_CLIENT = \
$(shell $(XMLRPC_C_CONFIG) c++2 client --libs)
pstream_client:%:%.o
$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_PSTREAM_CLIENT)
$(CXXLD) -o $@ $^ $(LIBS_PSTREAM_CLIENT) $(LDFLAGS)
LDADD_PSTREAM_SERVER = \
$(shell $(XMLRPC_C_CONFIG) c++2 pstream-server --ldadd)
LIBS_PSTREAM_SERVER = \
$(shell $(XMLRPC_C_CONFIG) c++2 pstream-server --libs)
pstream_inetd_server:%:%.o
$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_PSTREAM_SERVER)
pstream_inetd_server pstream_serial_server:%:%.o
$(CXXLD) -o $@ $^ $(LIBS_PSTREAM_SERVER) $(LDFLAGS)
OBJECTS = $(PROGS:%=%.o)
OBJECTS = $(patsubst %,%.o,$(patsubst %.cgi,%_cgi,$(PROGS)))
$(OBJECTS):%.o:%.cpp
$(CXX) -c $(INCLUDES) $(CXXFLAGS) $<
@@ -97,11 +111,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
.PHONY: distclean
distclean: clean