diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2004-10-27 13:02:57 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2004-10-27 13:02:57 +0000 |
| commit | 5676643d42dbbc1266f9424e8c44082a45ab436a (patch) | |
| tree | 8bd8807352cc9f7df5bf1b9f619a0214dbdb0bf3 /include/makeinclude | |
| parent | df5d8445ec424d299a61924b8c36afef90533267 (diff) | |
| download | ATCD-5676643d42dbbc1266f9424e8c44082a45ab436a.tar.gz | |
ChangeLogTag: Wed Oct 27 13:05:12 UTC 2004 Martin Corino <mcorino@remedy.nl>
Diffstat (limited to 'include/makeinclude')
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 5 | ||||
| -rw-r--r-- | include/makeinclude/rules.local.GNU | 23 |
2 files changed, 18 insertions, 10 deletions
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU index 442f02fa483..54e90e6055c 100644 --- a/include/makeinclude/rules.lib.GNU +++ b/include/makeinclude/rules.lib.GNU @@ -108,6 +108,7 @@ endif # shared_libs ace_lib_prelink ?= 0 aix_build ?= 0 +vxworks_ntbuild ?= 0 $(VLIB): $(VLOBJS) @@ -130,7 +131,11 @@ ifeq (1,$(ace_lib_prelink)) #### to lib files, for example. -$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR) endif # ace_lib_prelink +ifeq (1,$(vxworks_ntbuild)) + echo $(TMPINCDIR:%=%/*.o) $(filter %.o, $?) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA) +else echo $(TMPINCDIR:%=%/*.o) $(filter %.o, $?) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA); +endif ifdef ibmcxx_build # This is required to get AIX IBM C/C++ to instantiate and compile the needed # templates. diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU index e95a0f9c41b..150b06bbf9d 100644 --- a/include/makeinclude/rules.local.GNU +++ b/include/makeinclude/rules.local.GNU @@ -31,14 +31,7 @@ ifdef sun CLEANUP_DIRS += SunWS_cache endif -MKDIR_NTSTYLE = 0 -ifeq ("$(OS)", "Windows_NT") -ifneq ($(cygwin32), 1) -ifneq ($(mingw32), 1) - MKDIR_NTSTYLE = 1 -endif -endif -endif +vxworks_ntbuild ?= 0 #### TEMPLATE_REPOSITORY can be set in individual platform files #### to create template repository directories. See @@ -166,7 +159,7 @@ $(VSHDIR)%.$(SOEXT): $(VSHDIR)%.$(OBJEXT) $(VSHDIR)%.creation_stamp $(SOLINK) endif # SOLINK -ifeq ($(MKDIR_NTSTYLE),1) +ifeq ($(vxworks_ntbuild),1) $(VDIR)%.creation_stamp: @if not exist $(dir $@) mkdir $(subst /,,$(dir $@)) @echo > $@ @@ -177,7 +170,7 @@ $(VDIR)%.creation_stamp: endif ifneq ($(VDIR),$(VSHDIR)) - ifeq ($(MKDIR_NTSTYLE),1) + ifeq ($(vxworks_ntbuild),1) $(VSHDIR)%.creation_stamp: @if not exist $(dir $@) mkdir $(subst /,,$(dir $@)) @echo > $@ @@ -258,6 +251,15 @@ $(INSMAN)/man7/% \ $(INSMAN)/man8/% \ $(INSMAN)/manl/% \ $(INSMAN)/mann/% : +ifeq ($(vxworks_ntbuild),1) + @if exist $@ echo "$(@F) already installed" + @if not exist $@ echo "Installing $(@F:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) to $(@D)" && \ + $(RM) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) && \ + $(LN_S) $(shell pwd)/$(@F) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) && \ + echo "Installing $(@F) to $(@D)" && \ + $(RM) $@ && \ + $(LN_S) $(shell pwd)/$(@F) $@ +else ifneq ($(mingw32),1) @if test $(shell pwd) != $(@D) -o -n "$(SOVERSION)" ; then \ if test -s $@ ; then \ @@ -285,6 +287,7 @@ else fi ; \ fi endif +endif ifdef MVSLIB #special for MVS in order to use the .x files @if test -w $(@D) ; then \ |