diff options
| author | fuankg <fuankg@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-17 15:29:27 +0000 |
|---|---|---|
| committer | fuankg <fuankg@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-17 15:29:27 +0000 |
| commit | 63887b2ad642c70053479389cf09d1f05b6b356a (patch) | |
| tree | 05b37760593bf07a37f9217a922015ed8c9d8603 /NWGNUmakefile | |
| parent | 58989aa3c0c7e02642f8bbdd50e91278968a220e (diff) | |
| download | libapr-63887b2ad642c70053479389cf09d1f05b6b356a.tar.gz | |
backport NetWare build improvements.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.3.x@795114 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'NWGNUmakefile')
| -rw-r--r-- | NWGNUmakefile | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index c4a0dcf7e..571227ac9 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -350,23 +350,20 @@ nlms :: libs $(TARGET_nlm) install :: nlms $(INSTDIRS) FORCE copy $(OBJDIR)\aprlib.nlm $(INSTALLBASE)\*.* ifndef DEST - -copy $(subst /,\,$(APR))\STATUS $(INSTALLBASE)\*.apr - -copy $(subst /,\,$(APR))\LICENSE $(INSTALLBASE)\* - -copy $(subst /,\,$(APR))\CHANGES $(INSTALLBASE)\*.apr - -copy $(subst /,\,$(APRUTIL))\STATUS $(INSTALLBASE)\*.apu - -copy $(subst /,\,$(APRUTIL))\CHANGES $(INSTALLBASE)\*.apu - @echo rem copying the docs directories > xc.bat - @echo xcopy docs $(INSTALLBASE)\docs\*.* $(XCOPYSW) >> xc.bat - $(CMD) xc.bat - $(DEL) xc.bat + -$(CP) $(subst /,\,$(APR))\STATUS $(INSTALLBASE)\*.apr + -$(CP) $(subst /,\,$(APR))\LICENSE $(INSTALLBASE)\* + -$(CP) $(subst /,\,$(APR))\CHANGES $(INSTALLBASE)\*.apr + -$(CP) $(subst /,\,$(APRUTIL))\STATUS $(INSTALLBASE)\*.apu + -$(CP) $(subst /,\,$(APRUTIL))\CHANGES $(INSTALLBASE)\*.apu + @-$(XCP) $(subst /,\,$(APR))\docs $(INSTALLBASE)\docs\*.* endif ifndef DEST installdev :: $(INSTDEVDIRS) FORCE - -copy $(subst /,\,$(APR))\include\*.h $(INSTALLBASE)\include\*.* - -copy $(subst /,\,$(APRUTIL))\include\*.h $(INSTALLBASE)\include\*.* - -copy $(subst /,\,$(APR))\*.imp $(INSTALLBASE)\lib\*.* - -copy $(subst /,\,$(APR))\misc\netware\*.xdc $(INSTALLBASE)\lib\*.* + -$(CP) $(subst /,\,$(APR))\include\*.h $(INSTALLBASE)\include\*.* + -$(CP) $(subst /,\,$(APRUTIL))\include\*.h $(INSTALLBASE)\include\*.* + -$(CP) $(subst /,\,$(APR))\*.imp $(INSTALLBASE)\lib\*.* + -$(CP) $(subst /,\,$(APR))\misc\netware\*.xdc $(INSTALLBASE)\lib\*.* $(INSTDEVDIRS) :: $(CHKNOT) $@\NUL mkdir $@ @@ -382,11 +379,10 @@ vpath %.c poll/unix:shmem\unix:support/unix:random/unix vpath %.c dso/netware:memory/unix:mmap/unix:user/netware # Use the win32 network_io if Winsock is being used -ifdef USE_STDSOCKETS -vpath %.c network_io/unix -else -vpath %.c network_io/win32:network_io/unix +ifndef USE_STDSOCKETS +vpath %.c network_io/win32 endif +vpath %.c network_io/unix $(OBJDIR)/%.o: file_io/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt @echo Compiling $< |