From 6eca831c8030c9513aec181a2ad2abb9bd11f41b Mon Sep 17 00:00:00 2001 From: Ren RenJuan Date: Thu, 2 Jan 2014 17:06:01 +0000 Subject: [PATCH] * (sync) --- AusRegEPPTK/Makefile | 10 +++++----- AusRegEPPTK/session/SessionManagerTest.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AusRegEPPTK/Makefile b/AusRegEPPTK/Makefile index 35d15ec..33af21d 100644 --- a/AusRegEPPTK/Makefile +++ b/AusRegEPPTK/Makefile @@ -48,7 +48,7 @@ test_execs = $(subst .o,,$(test_objs)) calc_deps = \ $(CC) -MT '$(build_obj_dir)/$(basename $(notdir $@)).o $@' -MF $@ -MM $(CPPFLAGS) $(INCLUDE_DIR) $< -all: dirs $(objs) $(BUILD_LIB_DIR)/AusRegEPPTK.so +all: dirs $(objs) $(BUILD_LIB_DIR)/libAusRegEPPTK.so %.d: %.c $(calc_deps) @@ -78,7 +78,7 @@ $(BUILD_OBJ_DIR)/%.o: %.c $(CC) $(CPPFLAGS) -c -o $@ $(INCLUDE_DIR) $< -LDFLAGS_TESTS = -L$(BUILD_LIB_DIR) -lAusreg_EPP_toolkit \ +LDFLAGS_TESTS = -L$(BUILD_LIB_DIR) -lAusRegEPPTK \ -L$(XALAN_LIB_DIR) -lxalan-c -lxalanMsg\ -L$(XERCES_LIB_DIR) -lxerces-c \ -lssl \ @@ -103,15 +103,15 @@ dirs: -mkdir -p $(BUILD_LIB_DIR) -mkdir -p $(BUILD_OBJ_DIR) -AusRegEPPTK.so: -$(BUILD_LIB_DIR)/AusRegEPPTK.so: $(objs) +libAusRegEPPTK.so: +$(BUILD_LIB_DIR)/libAusRegEPPTK.so: $(objs) $(CXX) $(LDFLAGS) $(SHARED_CXXFLAGS) -shared $^ -o $@ doc: doxygen etc/Doxyfile clean: - $(RM) $(objs) $(BUILD_LIB_DIR)/AusRegEPPTK.so *~ + $(RM) $(objs) $(BUILD_LIB_DIR)/libAusRegEPPTK.so *~ $(RM) -r $(BUILD_OBJ_DIR) $(RM) -r $(BUILD_LIB_DIR) diff --git a/AusRegEPPTK/session/SessionManagerTest.cpp b/AusRegEPPTK/session/SessionManagerTest.cpp index 88da770..168d457 100644 --- a/AusRegEPPTK/session/SessionManagerTest.cpp +++ b/AusRegEPPTK/session/SessionManagerTest.cpp @@ -12,7 +12,7 @@ #include #include - +#include #include using namespace std;