You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by dm...@apache.org on 2005/07/15 15:09:29 UTC
cvs commit: xml-xalan/c/Tests Makefile.in
dmitryh 2005/07/15 06:09:29
Modified: c/Tests Makefile.in
Log:
Fixes for building the Perfromance testing application with VC7.1 and Linux . AIX build still fails
Revision Changes Path
1.10 +20 -3 xml-xalan/c/Tests/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 6 Aug 2004 03:16:12 -0000 1.9
+++ Makefile.in 15 Jul 2005 13:09:29 -0000 1.10
@@ -46,11 +46,17 @@
include $(XALANCROOT)/version.incl
include ../Makefile.incl
+PERFSOURCE = \
+ $(wildcard $(TESTS_DIR)/Performance/*.cpp)
+
+PERF_OBJECTS = \
+ $(addprefix $(XSL_OBJ_DIR)/,$(addsuffix .o,$(basename $(notdir $(PERFSOURCE)))))
+
all: Tests
-tests : ThreadTest Conf
+tests : ThreadTest Conf Perf
-Tests: ThreadTest Conf
+Tests: ThreadTest Conf Perf
ThreadTest: prepare $(XSL_BIN_DIR)/ThreadTest
@@ -76,10 +82,21 @@
$(MKINSTALLDIRS) $(DESTDIR)/$(bindir)
$(INSTALL_PROGRAM) $(XSL_BIN_DIR)/Conf$(EXT) $(DESTDIR)/$(bindir)
$(INSTALL_PROGRAM) $(XSL_BIN_DIR)/ThreadTest$(EXT) $(DESTDIR)/$(bindir)
+ $(INSTALL_PROGRAM) $(XSL_BIN_DIR)/Perf$(EXT) $(DESTDIR)/$(bindir)
+
install-extras:
cp -r $(TESTS_DIR) $(DESTDIR)/$(prefix)
+Perf: prepare $(XSL_BIN_DIR)/Perf
+
+$(XSL_BIN_DIR)/Perf: $(PERF_OBJECTS)
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
+ ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS)
+
+${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Performance/%.cpp
+ $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+
clean:
rm -rf $(XSL_OBJ_DIR)/*.o
rm -rf $(OUTDIR)/so_locations
@@ -87,5 +104,5 @@
rm -rf $(XSL_LIB_DIR)/SunWS_cache
rm -f $(XSL_BIN_DIR)/Conf$(EXT)
rm -f $(XSL_BIN_DIR)/ThreadTest$(EXT)
-
+ rm -f $(XSL_BIN_DIR)/Perf$(EXT)
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org