generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated dependency lib versions in static makefiles.

Browse Source
This commit is contained in:
Guenter Knauf 2012-04-12 22:01:45 +02:00
parent 9b2bed22fc
commit c8374cdc10
6 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nw/Makefile.netware
View File

@ -14,12 +14,12 @@ endif
# Edit the path below to point to the base of your Zlib sources. # Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH ifndef ZLIB_PATH
ZLIB_PATH = ../../zlib-1.2.5 ZLIB_PATH = ../../zlib-1.2.6
endif endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8r OPENSSL_PATH = ../../openssl-0.9.8u
endif endif
# Edit the path below to point to your Distribution folder. # Edit the path below to point to your Distribution folder.
@ -229,9 +229,11 @@ $(OBJDIR)/version.inc: ../include/libssh2.h $(OBJDIR)
dist: all $(DISTDIR) $(DISTDIR)/readme.txt dist: all $(DISTDIR) $(DISTDIR)/readme.txt
@-$(MD) $(DISTDIR)$(DS)bin @-$(MD) $(DISTDIR)$(DS)bin
@-$(CP) ../AUTHORS $(DISTDIR)
@-$(CP) ../COPYING $(DISTDIR) @-$(CP) ../COPYING $(DISTDIR)
@-$(CP) ../INSTALL $(DISTDIR) @-$(CP) ../INSTALL $(DISTDIR)
@-$(CP) ../README $(DISTDIR) @-$(CP) ../README $(DISTDIR)
@-$(CP) ../RELEASE-NOTES $(DEVLDIR)
@$(CP) $(TARGET).nlm $(DISTDIR)/bin @$(CP) $(TARGET).nlm $(DISTDIR)/bin
@echo Creating $(DISTARC) @echo Creating $(DISTARC)
@$(ZIP) $(DISTARC) $(DISTDIR)/* < $(DISTDIR)/readme.txt @$(ZIP) $(DISTARC) $(DISTDIR)/* < $(DISTDIR)/readme.txt
@ -240,9 +242,11 @@ dev: all $(DEVLDIR) $(DEVLDIR)/readme.txt
@-$(MD) $(DEVLDIR)$(DS)bin @-$(MD) $(DEVLDIR)$(DS)bin
@-$(MD) $(DEVLDIR)$(DS)include @-$(MD) $(DEVLDIR)$(DS)include
@-$(MD) $(DEVLDIR)$(DS)nw @-$(MD) $(DEVLDIR)$(DS)nw
@-$(CP) ../AUTHORS $(DISTDIR)
@-$(CP) ../COPYING $(DISTDIR) @-$(CP) ../COPYING $(DISTDIR)
@-$(CP) ../INSTALL $(DEVLDIR) @-$(CP) ../INSTALL $(DEVLDIR)
@-$(CP) ../README $(DEVLDIR) @-$(CP) ../README $(DEVLDIR)
@-$(CP) ../RELEASE-NOTES $(DEVLDIR)
@$(CP) $(TARGET).nlm $(DEVLDIR)/bin @$(CP) $(TARGET).nlm $(DEVLDIR)/bin
@$(CP) ../include/*.h $(DEVLDIR)/include @$(CP) ../include/*.h $(DEVLDIR)/include
@$(CP) libssh2_config.h $(DEVLDIR)/include @$(CP) libssh2_config.h $(DEVLDIR)/include

4
nw/test/Makefile.netware
View File

@ -14,12 +14,12 @@ endif
# Edit the path below to point to the base of your Zlib sources. # Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH ifndef ZLIB_PATH
ZLIB_PATH = ../../../zlib-1.2.5 ZLIB_PATH = ../../../zlib-1.2.6
endif endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../../openssl-0.9.8r OPENSSL_PATH = ../../../openssl-0.9.8u
endif endif
# Edit the var below to enable static linking of libssh2 and libz # Edit the var below to enable static linking of libssh2 and libz

14
win32/GNUmakefile
View File

@ -9,14 +9,14 @@
# Edit the path below to point to the base of your Zlib sources. # Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH ifndef ZLIB_PATH
ZLIB_PATH = ../../zlib-1.2.5 ZLIB_PATH = ../../zlib-1.2.6
endif endif
# since currently always enabled in libssh2_config.h set here too! # since currently always enabled in libssh2_config.h set here too!
WITH_ZLIB = 1 WITH_ZLIB = 1
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8r OPENSSL_PATH = ../../openssl-0.9.8u
endif endif
# Edit the var below to set to your architecture or set environment var. # Edit the var below to set to your architecture or set environment var.
@ -72,7 +72,7 @@ DS = /
else else
CP = copy CP = copy
RM = del /q /f 2>NUL RM = del /q /f 2>NUL
MD = md MD = md 2>NUL
RD = rd /q /s 2>NUL RD = rd /q /s 2>NUL
XX = XX =
DS = $(XX)\$(XX) DS = $(XX)\$(XX)
@ -172,9 +172,11 @@ $(OBJDIR)/version.inc: ../include/libssh2.h $(OBJDIR)
dist: all $(DISTDIR) $(DISTDIR)/readme.txt dist: all $(DISTDIR) $(DISTDIR)/readme.txt
@-$(MD) $(DISTDIR)$(DS)bin @-$(MD) $(DISTDIR)$(DS)bin
@-$(CP) ..$(DS)AUTHORS $(DISTDIR)
@-$(CP) ..$(DS)COPYING $(DISTDIR)
@-$(CP) ..$(DS)INSTALL $(DISTDIR) @-$(CP) ..$(DS)INSTALL $(DISTDIR)
@-$(CP) ..$(DS)LICENSE $(DISTDIR)
@-$(CP) ..$(DS)README $(DISTDIR) @-$(CP) ..$(DS)README $(DISTDIR)
@-$(CP) ..$(DS)RELEASE-NOTES $(DEVLDIR)
@$(CP) $(TARGET).dll $(DISTDIR)$(DS)bin @$(CP) $(TARGET).dll $(DISTDIR)$(DS)bin
@echo Creating $(DISTARC) @echo Creating $(DISTARC)
@$(ZIP) $(DISTARC) $(DISTDIR)/* < $(DISTDIR)/readme.txt @$(ZIP) $(DISTARC) $(DISTDIR)/* < $(DISTDIR)/readme.txt
@ -183,9 +185,11 @@ dev: all $(DEVLDIR) $(DEVLDIR)/readme.txt
@-$(MD) $(DEVLDIR)$(DS)bin @-$(MD) $(DEVLDIR)$(DS)bin
@-$(MD)$(DEVLDIR)$(DS)include @-$(MD)$(DEVLDIR)$(DS)include
@-$(MD) $(DEVLDIR)$(DS)win32 @-$(MD) $(DEVLDIR)$(DS)win32
@-$(CP) ..$(DS)AUTHORS $(DISTDIR)
@-$(CP) ..$(DS)COPYING $(DISTDIR)
@-$(CP) ..$(DS)INSTALL $(DEVLDIR) @-$(CP) ..$(DS)INSTALL $(DEVLDIR)
@-$(CP) ..$(DS)LICENSE $(DEVLDIR)
@-$(CP) ..$(DS)README $(DEVLDIR) @-$(CP) ..$(DS)README $(DEVLDIR)
@-$(CP) ..$(DS)RELEASE-NOTES $(DEVLDIR)
@$(CP) $(TARGET).dll $(DEVLDIR)$(DS)bin @$(CP) $(TARGET).dll $(DEVLDIR)$(DS)bin
@$(CP) ..$(DS)include$(DS)*.h $(DEVLDIR)$(DS)include @$(CP) ..$(DS)include$(DS)*.h $(DEVLDIR)$(DS)include
@$(CP) libssh2_config.h $(DEVLDIR)/include @$(CP) libssh2_config.h $(DEVLDIR)/include

4
win32/Makefile.Watcom
View File

@ -64,13 +64,13 @@ CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6
!ifdef %zlib_root !ifdef %zlib_root
ZLIB_ROOT = $(%zlib_root) ZLIB_ROOT = $(%zlib_root)
!else !else
ZLIB_ROOT = ..\..\zlib-1.2.5 ZLIB_ROOT = ..\..\zlib-1.2.6
!endif !endif
!ifdef %openssl_root !ifdef %openssl_root
OPENSSL_ROOT = $(%openssl_root) OPENSSL_ROOT = $(%openssl_root)
!else !else
OPENSSL_ROOT = ..\..\openssl-0.9.8r OPENSSL_ROOT = ..\..\openssl-0.9.8u
!endif !endif
#!ifdef %use_zlib #!ifdef %use_zlib

8
win32/config.mk
View File

@ -1,10 +1,10 @@
# Tweak these for your system # Tweak these for your system
OPENSSLINC=..\openssl-0.9.8q\inc32 OPENSSLINC=..\openssl-0.9.8u\inc32
OPENSSLLIB=..\openssl-0.9.8q\out32dll OPENSSLLIB=..\openssl-0.9.8u\out32dll
ZLIBINC=-DLIBSSH2_HAVE_ZLIB=1 /I..\zlib-1.2.5 ZLIBINC=-DLIBSSH2_HAVE_ZLIB=1 /I..\zlib-1.2.6
ZLIBLIB=..\zlib-1.2.5 ZLIBLIB=..\zlib-1.2.6
!if "$(TARGET)" == "" !if "$(TARGET)" == ""
TARGET=Release TARGET=Release

6
win32/test/GNUmakefile
View File

@ -9,12 +9,12 @@
# Edit the path below to point to the base of your Zlib sources. # Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH ifndef ZLIB_PATH
ZLIB_PATH = ../../../zlib-1.2.5 ZLIB_PATH = ../../../zlib-1.2.6
endif endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../../openssl-0.9.8r OPENSSL_PATH = ../../../openssl-0.9.8u
endif endif
# Edit the var below to set to your architecture or set environment var. # Edit the var below to set to your architecture or set environment var.
@ -61,7 +61,7 @@ DS = /
else else
CP = copy CP = copy
RM = del /q /f 2>NUL RM = del /q /f 2>NUL
MD = md MD = md 2>NUL
RD = rd /q /s 2>NUL RD = rd /q /s 2>NUL
XX = XX =
DS = $(XX)\$(XX) DS = $(XX)\$(XX)