diff options
| author | Adam Mitz <mitza@ociweb.com> | 2015-06-23 15:43:02 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2015-06-23 15:43:02 -0500 |
| commit | b589dc30458fa73e2ab757cb1413702bbdaa98eb (patch) | |
| tree | 1d97e09f259956dfda04e84c0de28ea54cebc730 | |
| parent | 335210ed80e45a21eb251a6e0ed3eed4194605f7 (diff) | |
| parent | 999fa10b949cb90f86dc8095fff0a5d549a5f910 (diff) | |
| download | ATCD-b589dc30458fa73e2ab757cb1413702bbdaa98eb.tar.gz | |
Merge pull request #101 from mitza-oci/VxWorks7
VxWorks7 wrap up and NEWS
| -rw-r--r-- | ACE/NEWS | 3 | ||||
| -rw-r--r-- | ACE/include/makeinclude/rules.lib.GNU | 28 |
2 files changed, 18 insertions, 13 deletions
@@ -8,6 +8,9 @@ USER VISIBLE CHANGES BETWEEN ACE-6.3.2 and ACE-6.3.3 . As part of the release script we now generate vc12 and vc14 solution files which are packaged as part of the release +. Added support for VxWorks 7 (kernel mode and RTP). + See the comments in include/makeinclude/platform_vxworks7.0.GNU for details. + USER VISIBLE CHANGES BETWEEN ACE-6.3.1 and ACE-6.3.2 ==================================================== diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU index eb5c50946f7..94868ff0d87 100644 --- a/ACE/include/makeinclude/rules.lib.GNU +++ b/ACE/include/makeinclude/rules.lib.GNU @@ -119,20 +119,22 @@ ifdef ARCH ARCHDIR = $(ARCH)/ endif -ifdef static_libs - LIB_INSTALL += $(VLIB:$(ARCHDIR)%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VLIB:$(ARCHDIR)%=$(INSLIB)/%) -endif # static_libs +ifneq ($(INSLIB),) + ifdef static_libs + LIB_INSTALL += $(VLIB:$(ARCHDIR)%=$(INSLIB)/%) + CLEANUP_INSTALL += $(CLEANUP_VLIB:$(ARCHDIR)%=$(INSLIB)/%) + endif # static_libs -ifdef shared_libs - LIB_INSTALL += $(VSHLIB:$(ARCHDIR)%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VSHLIB:$(ARCHDIR)%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VSHLIB_NO_VER:$(ARCHDIR)%=$(INSLIB)/%*) - ifdef SHLIBA - LIB_INSTALL += $(VSHLIBA:$(ARCHDIR)%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_SHLIBA:$(ARCHDIR)%=$(INSLIB)/%) - endif -endif # shared_libs + ifdef shared_libs + LIB_INSTALL += $(VSHLIB:$(ARCHDIR)%=$(INSLIB)/%) + CLEANUP_INSTALL += $(CLEANUP_VSHLIB:$(ARCHDIR)%=$(INSLIB)/%) + CLEANUP_INSTALL += $(CLEANUP_VSHLIB_NO_VER:$(ARCHDIR)%=$(INSLIB)/%*) + ifdef SHLIBA + LIB_INSTALL += $(VSHLIBA:$(ARCHDIR)%=$(INSLIB)/%) + CLEANUP_INSTALL += $(CLEANUP_SHLIBA:$(ARCHDIR)%=$(INSLIB)/%) + endif + endif # shared_libs +endif # INSLIB ace_lib_prelink ?= 0 aix_build ?= 0 |