Attachment #212884 for bug #296656

Lines 253-259 Link Here

(-)cppserv-0.2.13.orig/rules.mk (-2 / +3 lines)
253	$(Q)touch $$@	253	$(Q)touch $$@
254	$(ADON_BUILD)/$(1)/$(2).so: $(ADON_BUILD)/$(2)-dep $(3)	254	$(ADON_BUILD)/$(1)/$(2).so: $(ADON_BUILD)/$(2)-dep $(3)
255	$(LINK) $$(filter-out $(ADON_BUILD)/$(2)-dep,$$^) $$(SHLIB_FLAGS) $$(ADON_LIBFLAGS) \	255	$(LINK) $$(filter-out $(ADON_BUILD)/$(2)-dep,$$^) $$(SHLIB_FLAGS) $$(ADON_LIBFLAGS) \
256	$($(2)_SHLIB_FLAGS) $($(2)_LDFLAGS) $(LOCAL_LDADD) -Wl,-soname,$(2).so -shared -o $$@	256	$($(2)_SHLIB_FLAGS) $($(2)_LDFLAGS) $(LOCAL_LDADD) -Wl,-soname,$(2).so -shared -o $$@ $($(2)_LIBADD)
257	endef	257	endef
258		258
259	#FIXME: -fPIC is bit non-portable	259	#FIXME: -fPIC is bit non-portable
Lines 300-306 Link Here
300	$(ADON_BUILD)/$(1)/$(2): $(ADON_BUILD)/$(2)-dep $(3)	300	$(ADON_BUILD)/$(1)/$(2): $(ADON_BUILD)/$(2)-dep $(3)
301	$(LINK) $$(filter-out $(ADON_BUILD)/$(2)-dep,$$^) $$(TARGET_LDFLAGS) \	301	$(LINK) $$(filter-out $(ADON_BUILD)/$(2)-dep,$$^) $$(TARGET_LDFLAGS) \
302	$$(TOP_LDFLAGS) $$(ADON_LIBFLAGS) \	302	$$(TOP_LDFLAGS) $$(ADON_LIBFLAGS) \
303	$(LOCAL_LDFLAGS) $($(2)_LDFLAGS) $$(LDFLAGS) -o $$@	303	$(LOCAL_LDFLAGS) $($(2)_LDFLAGS) $$(LDFLAGS) -o $$@ \
		304	$($(2)_LDADD)
304	endef	305	endef
305		306
306	# curdir, progname, instvar	307	# curdir, progname, instvar

Lines 28-34 Link Here

(-)cppserv-0.2.13.orig/src/cxxsp/parser/Makefile.adon (-1 / +1 lines)
28	csplex.lpp	28	csplex.lpp
29		29
30	cxxsp_compile_SOURCES:= cxxsp_compile.cpp	30	cxxsp_compile_SOURCES:= cxxsp_compile.cpp
31	cxxsp_compile_LDFLAGS:= -lutil -lcxxsp_parser -ldl -lservlet -lcxxtaglib	31	cxxsp_compile_LDADD:= -lutil -lcxxsp_parser -lservlet -lcxxtaglib -ldl
32	cxxsp_compile_DEPS:=libcxxtaglib cxxsp_runtime_taglib	32	cxxsp_compile_DEPS:=libcxxtaglib cxxsp_runtime_taglib
33		33
34	noinst_HEADERS:= \	34	noinst_HEADERS:= \

Lines 21-26 Link Here

(-)cppserv-0.2.13.orig/src/cxxsp/taglib/Makefile.adon (-1 / +1 lines)
21	lib_LTLIBRARIES:=libcxxtaglib cxxsp_runtime_taglib	21	lib_LTLIBRARIES:=libcxxtaglib cxxsp_runtime_taglib
22	libcxxtaglib_SOURCES:=Taglib.cpp CompileTimeTaglib.cpp	22	libcxxtaglib_SOURCES:=Taglib.cpp CompileTimeTaglib.cpp
23	cxxsp_runtime_taglib_SOURCES:=RunTimeTaglib.cpp	23	cxxsp_runtime_taglib_SOURCES:=RunTimeTaglib.cpp
24	cxxsp_runtime_taglib_LDFLAGS:=-lcxxtaglib	24	cxxsp_runtime_taglib_LDADD:=-lcxxtaglib
25	cxxsp_runtime_taglib_DEPS:=libcxxtaglib	25	cxxsp_runtime_taglib_DEPS:=libcxxtaglib
26	noinst_HEADERS:=RunTimeTaglib.h	26	noinst_HEADERS:=RunTimeTaglib.h

Lines 37-46 Link Here

(-)cppserv-0.2.13.orig/src/container/Makefile.adon (-2 / +2 lines)
37	requesthandler.cpp \	37	requesthandler.cpp \
38	cthreadpool.cpp \	38	cthreadpool.cpp \
39	requestlistener.cpp	39	requestlistener.cpp
40	cppserv_LDFLAGS := -lservlet -lsputil3 -lsocket++ -lpthread -ldl -lserverconfig	40	cppserv_LDADD := -lservlet -lsputil3 -lsocket++ -lpthread -lserverconfig -ldl
41	cppserv_CPPFLAGS := -I$(ADON_SRC)/include/container	41	cppserv_CPPFLAGS := -I$(ADON_SRC)/include/container
42	cppserv_DEPS:= libservlet libserverconfig	42	cppserv_DEPS:= libservlet libserverconfig
43		43
44	ifeq ($(HAVE_LIBMAGIC),1)	44	ifeq ($(HAVE_LIBMAGIC),1)
45	cppserv_LDFLAGS+=-lmagic	45	cppserv_LDADD+=-lmagic
46	endif	46	endif

Return to bug 296656