diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-11-29 13:09:54 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-11-29 13:09:54 +0000 |
| commit | ca2f62a3d74b9eee0ab327456ca1de8ddc2a6763 (patch) | |
| tree | a16fd0589e445fd5a02bca6bbb996f2f123005df | |
| parent | afacfdaac9367405ac7b864b92d06764c5031a12 (diff) | |
| download | ATCD-ca2f62a3d74b9eee0ab327456ca1de8ddc2a6763.tar.gz | |
ChangeLogTag: Mon Nov 29 07:04:58 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 21 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 12 |
2 files changed, 25 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index f25e59c5de8..a05fc322df1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,24 @@ +Mon Nov 29 07:04:58 2004 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Moved the setting of SOVERSION below the include for + wrapper_macros.GNU and enclose it in a if check for versioned_so + to be 1. This allows users to build without versioned shared + libraries. + + Also, fixed a problem with the realclean target. The executable + extension was not added when the installed target was added to the + CLEANUP_INSTALL macro. + + Thanks to Johnny Willemsen for reporting both of these problems. + Sun Nov 28 22:10:48 2004 J.T. Conklin <jtc@acorntoolworks.com> - * bin/am_edit: + * bin/am_edit: - Removed old file. MPC-generated Makefile.am's make this script - obsolete. + Removed old file. MPC-generated Makefile.am's make this script + obsolete. Mon Nov 29 07:36:03 2004 Olli Savia <ops@iki.fi> diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 8541bcb82b6..ff2810a4172 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -123,10 +123,6 @@ endif OUTPUT_DIRECTORY = $(INSLIB) <%endif%> -<%if(version)%> -SOVERSION = .<%version%> -<%endif%> - include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU ## We don't need the ACELIB setting from wrapper_macros.GNU ACELIB = @@ -134,6 +130,12 @@ ACELIB = tao_dont_use_idl_make_rule = 1 include $(TAO_ROOT)/rules.tao.GNU <%endif%> +<%if(version)%> + +ifeq ($(versioned_so),1) +SOVERSION = .<%version%> +endif +<%endif%> # To build multiple targets in the same directory on AIX, it works # best to have a template directory per project. @@ -321,7 +323,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU ifneq ($(OUTPUT_DIRECTORY),) ifneq ($(OUTPUT_DIRECTORY),.) INSTALL = $(VBIN:%=$(INSBIN)/%) - CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%) + CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%$(VAR)$(EXEEXT)) endif endif |