diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-24 03:04:41 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-24 03:04:41 +0000 |
| commit | d8554657fc7ec46146f7d13598b2a318c7fe9fc9 (patch) | |
| tree | b2c64d8d7ca7e41243ab4081d4666898646e931e | |
| parent | e22f79d7dacec7edab52c377d6db44949950abb3 (diff) | |
| download | ATCD-d8554657fc7ec46146f7d13598b2a318c7fe9fc9.tar.gz | |
ChangeLogTag:Mon Aug 23 22:03:24 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 8 | ||||
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 18 | ||||
| -rw-r--r-- | include/makeinclude/rules.local.GNU | 3 |
3 files changed, 15 insertions, 14 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index fb54e5879d9..aed0779850b 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,11 @@ +Mon Aug 23 22:03:24 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * include/makeinclude/rules.lib.GNU: + * include/makeinclude/rules.local.GNU: + When compiling both shared and static libraries only one of them + was installed. Thanks to Paul Calabrese <calabrese_p@ociweb.com> + for providing this fix. + Mon Aug 23 21:41:43 1999 Carlos O'Ryan <coryan@cs.wustl.edu> * tests/run_tests.pl: diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU index a5b6677aa03..2e91d5b8bfa 100644 --- a/include/makeinclude/rules.lib.GNU +++ b/include/makeinclude/rules.lib.GNU @@ -42,23 +42,17 @@ endif # ! PRELIB # Comment out for now... # $(DEFS:%=$(INSINC)/%) \ -ifdef shared_libs_only - INSTALL += \ - $(VSHLIB:%.$(SOEXT)=$(INSLIB)/%.$(SOEXT)$(ACE_LDSO_Version_Number)) -ifdef SHLIBA - INSTALL += $(VSHLIBA:%=$(INSLIB)/%) -endif -else -ifdef static_libs_only +ifdef static_libs INSTALL += $(VLIB:%.a=$(INSLIB)/%.a) -else - INSTALL += $(VLIB:%.a=$(INSLIB)/%.a) \ +endif # static_libs + +ifdef shared_libs + INSTALL += \ $(VSHLIB:%.$(SOEXT)=$(INSLIB)/%.$(SOEXT)$(ACE_LDSO_Version_Number)) ifdef SHLIBA INSTALL += $(VSHLIBA:%=$(INSLIB)/%) endif -endif # static_libs_only -endif # shared_libs_only +endif # shared_libs ifdef PRELIB # Unfortunately, gcc has to do a link of all of the objects (during which diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU index 46b190e81e8..87124060b72 100644 --- a/include/makeinclude/rules.local.GNU +++ b/include/makeinclude/rules.local.GNU @@ -128,8 +128,7 @@ endif # ! LN_S $(INSBIN)/%$(VAR) \ $(INSINC)/ace% \ -$(INSLIB)/%$(VAR).a \ -$(INSLIB)/%$(VAR).$(SOEXT)$(ACE_LDSO_Version_Number) \ +$(INSLIB)/% \ $(INSMAN)/man1/% \ $(INSMAN)/man2/% \ $(INSMAN)/man3/% \ |