diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | examples/csoap/Makefile.am | 10 | ||||
| -rw-r--r-- | examples/nanohttp/Makefile.am | 12 | ||||
| -rwxr-xr-x | wsdl2c/Makefile.am | 4 | ||||
| -rwxr-xr-x | xsd2c/Makefile.am | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 04e1965..f429bd7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## top directory #Build in these directories: -SUBDIRS= $(NANOHTTP_LIBRARY_NAME) $(GENERIC_LIBRARY_NAME) xsd2c wsdl2c examples +SUBDIRS= $(NANOHTTP_LIBRARY_NAME) $(GENERIC_LIBRARY_NAME) examples #Distribute these directories: DIST_SUBDIRS = $(GENERIC_LIBRARY_NAME) diff --git a/examples/csoap/Makefile.am b/examples/csoap/Makefile.am index 3d47dc3..5601fba 100644 --- a/examples/csoap/Makefile.am +++ b/examples/csoap/Makefile.am @@ -1,22 +1,22 @@ bin_PROGRAMS=simpleclient simpleserver echoattachments-client echoattachments-server INCLUDES=-I$(top_srcdir)/ $(LIBXML_CFLAGS) -LDFLAGS=-L$(top_builddir)/nanohttp -lnanohttp-$(GENERIC_API_VERSION) \ +csoap_LDFLAG=-L$(top_builddir)/nanohttp -lnanohttp-$(GENERIC_API_VERSION) \ $(LIBSOCKET) $(LIBNSL) -lpthread\ -L$(top_builddir)/libcsoap/ -lcsoap-$(GENERIC_API_VERSION) \ $(LIBXML_LIBS) simpleclient_SOURCES=simpleclient.c -simpleclient_LDFLAGS=$(LDFLAGS) +simpleclient_LDFLAGS=$(csoap_LDFLAG) simpleserver_SOURCES=simpleserver.c -simpleserver_LDFLAGS=$(LDFLAGS) +simpleserver_LDFLAGS=$(csoap_LDFLAG) echoattachments_server_SOURCES=echoattachments-server.c -echoattachments_server_LDFLAGS=$(LDFLAGS) +echoattachments_server_LDFLAGS=$(csoap_LDFLAG) echoattachments_client_SOURCES=echoattachments-client.c -echoattachments_client_LDFLAGS=$(LDFLAGS) +echoattachments_client_LDFLAGS=$(csoap_LDFLAG) diff --git a/examples/nanohttp/Makefile.am b/examples/nanohttp/Makefile.am index 4ade27e..8e4f7cc 100644 --- a/examples/nanohttp/Makefile.am +++ b/examples/nanohttp/Makefile.am @@ -1,23 +1,23 @@ bin_PROGRAMS=httpget httpgetcb httppost httpcpost postserver INCLUDES=-I$(top_srcdir)/ -LDFLAGS=-L$(top_builddir)/nanohttp -lnanohttp-$(GENERIC_API_VERSION) \ +nanohttp_LDFLAG=-L$(top_builddir)/nanohttp -lnanohttp-$(GENERIC_API_VERSION) \ $(LIBSOCKET) $(LIBNSL) -lpthread httpget_SOURCES=httpget.c -httpget_LDFLAGS=$(LDFLAGS) +httpget_LDFLAGS=$(nanohttp_LDFLAG) httpgetcb_SOURCES=httpgetcb.c -httpgetcb_LDFLAGS=$(LDFLAGS) +httpgetcb_LDFLAGS=$(nanohttp_LDFLAG) httppost_SOURCES=httppost.c -httppost_LDFLAGS=$(LDFLAGS) +httppost_LDFLAGS=$(nanohttp_LDFLAG) httpcpost_SOURCES=httpcpost.c -httpcpost_LDFLAGS=$(LDFLAGS) +httpcpost_LDFLAGS=$(nanohttp_LDFLAG) postserver_SOURCES=postserver.c -postserver_LDFLAGS=$(LDFLAGS) +postserver_LDFLAGS=$(nanohttp_LDFLAG) diff --git a/wsdl2c/Makefile.am b/wsdl2c/Makefile.am index 6a4518f..db3b340 100755 --- a/wsdl2c/Makefile.am +++ b/wsdl2c/Makefile.am @@ -1,7 +1,7 @@ bin_PROGRAMS=wsdl2c INCLUDES=$(LIBXML_CFLAGS) -I$(top_srcdir) -LDFLAGS=$(LIBXML_LIBS) +wsdl2cl_LDFLAG=$(LIBXML_LIBS) xsd2c_root= $(top_srcdir)/xsd2c @@ -13,5 +13,5 @@ xsd2c_objs=../xsd2c/util.o \ ../xsd2c/Enumeration.o wsdl2c_SOURCES=CallVar.c CallFunc.c CallList.c codewriter.c wsdl2c.c -wsdl2c_LDFLAGS=$(LDFLAGS) $(xsd2c_objs) +wsdl2c_LDFLAGS=$(wsdl2cl_LDFLAG) $(xsd2c_objs) diff --git a/xsd2c/Makefile.am b/xsd2c/Makefile.am index 5b964cc..043c8cd 100755 --- a/xsd2c/Makefile.am +++ b/xsd2c/Makefile.am @@ -1,8 +1,8 @@ bin_PROGRAMS=xsd2c INCLUDES=$(LIBXML_CFLAGS) -LDFLAGS=$(LIBXML_LIBS) +x_LDFLAG=$(LIBXML_LIBS) xsd2c_SOURCES=tr.c Enumeration.c util.c obj.c formatter.c xsd2c.c main.c -xsd2c_LDFLAGS=$(LDFLAGS) +xsd2c_LDFLAGS=$(x_LDFLAG) |