diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-03-27 12:54:21 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-03-27 12:54:21 +0000 |
commit | b30911b1f15ece70121093fbe1704cc35b988635 (patch) | |
tree | e9dd1cb8655efe5300e65c80c073250f2c5a6ada /ACE | |
parent | b21a9da3919e980795de3fffe0ee6717076bc694 (diff) | |
download | ATCD-b30911b1f15ece70121093fbe1704cc35b988635.tar.gz |
Thu Mar 27 12:54:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE')
-rw-r--r-- | ACE/ChangeLog | 7 | ||||
-rw-r--r-- | ACE/include/makeinclude/platform_vxworks6.3.GNU | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index b15953badea..33a4ec95f0f 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,8 +1,13 @@ +Thu Mar 27 12:54:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_vxworks6.3.GNU: + Small change to get the VxWorks shared library build further + Thu Mar 27 12:46:48 UTC 2008 Chad Elliott <elliott_c@ociweb.com> * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp: - Changed ACE_TMAIN to run_main for the non-threaded portion of the + Changed ACE_TMAIN to run_main for the non-threaded portion of the #ifdef. ACE_TMAIN is defined in Main.cpp. Thu Mar 27 12:37:18 UTC 2008 Chad Elliott <elliott_c@ociweb.com> diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU index 7e086293f82..5f68a382f42 100644 --- a/ACE/include/makeinclude/platform_vxworks6.3.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU @@ -247,9 +247,9 @@ ifeq ($(VXWORKSLINK), 1) PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) ifeq ($(VX_SO_BUILD),1) ## Shared lib builds for VxWorks will also build 'import' libraries - LIB_INSTALL += $(VLIB:%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VLIB:%=$(INSLIB)/%) - REALCLEAN_FILES += $(CLEANUP_LIB:%=%) $(CLEANUP_LIB:%=%_debug) $(CLEANUP_LIB:%=%_profile) $(CLEANUP_LIB:%=%_optimize) + #LIB_INSTALL += $(VLIB:%=$(INSLIB)/%) + #CLEANUP_INSTALL += $(CLEANUP_VLIB:%=$(INSLIB)/%) + #REALCLEAN_FILES += $(CLEANUP_LIB:%=%) $(CLEANUP_LIB:%=%_debug) $(CLEANUP_LIB:%=%_profile) $(CLEANUP_LIB:%=%_optimize) endif else LD_PARTIAL += -L$(ACE_ROOT)/ace -L./ $(LDLIBPATH) $(LD_LINK_PATH) $(LD_PARTIALFLAGS) |