ports/libssh2
ports/libssh2
1
1
Форкнуть 0
Код Релизы 1 Активность

More MinGW makefile tweaks.

Просмотр исходного кода 
Renamed *.mingw makefiles to GNUmakefile since GNU make picks these
up automatically, and therefore win32/Makefile removed.
Этот коммит содержится в:
Guenter Knauf 2011-09-10 14:10:45 +02:00
родитель 2e12cfaa23
Коммит c75ae587c0
4 изменённых файлов: 13 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
Makefile.am
Просмотреть файл

@ -25,12 +25,10 @@ VMSFILES = vms/libssh2_make_example.dcl vms/libssh2_make_help.dcl \
vms/libssh2_make_kit.dcl vms/libssh2_make_lib.dcl vms/man2help.c \ vms/libssh2_make_kit.dcl vms/libssh2_make_lib.dcl vms/man2help.c \
vms/readme.vms vms/libssh2_config.h vms/readme.vms vms/libssh2_config.h
WIN32FILES = win32/GNUmakefile win32/test/GNUmakefile \
WIN32FILES = win32/Makefile.mingw win32/test/Makefile.mingw \ win32/libssh2_config.h win32/config.mk win32/rules.mk \
win32/libssh2.dsw win32/config.mk win32/Makefile \ win32/Makefile.Watcom win32/libssh2.dsw win32/tests.dsp $(DSP) \
win32/libssh2_config.h win32/tests.dsp win32/rules.mk $(DSP) \ win32/msvcproj.head win32/msvcproj.foot win32/libssh2.rc
win32/msvcproj.head win32/msvcproj.foot win32/libssh2.rc \
win32/Makefile.Watcom
EXTRA_DIST = $(WIN32FILES) buildconf $(NETWAREFILES) get_ver.awk HACKING \ EXTRA_DIST = $(WIN32FILES) buildconf $(NETWAREFILES) get_ver.awk HACKING \
maketgz NMakefile TODO RELEASE-NOTES libssh2.pc.in $(VMSFILES) maketgz NMakefile TODO RELEASE-NOTES libssh2.pc.in $(VMSFILES)

12
win32/Makefile.mingw → win32/GNUmakefile
Просмотреть файл

@ -1,9 +1,9 @@
######################################################################### #########################################################################
# #
## Makefile for building libssh2 (Win32 version - gnu make) ## Makefile for building libssh2 (Win32 version - gnu make)
## Use: make -f Makefile.mingw [help|all|clean|dev|devclean|dist|distclean|dll|objclean] ## Use: make -f GNUmakefile [help|all|clean|dev|devclean|dist|distclean|dll|objclean]
## ##
## Comments to: Guenter Knauf http://www.gknw.net/phpbb ## Hacked by: Guenter Knauf
# #
######################################################################### #########################################################################
@ -160,7 +160,7 @@ prebuild: $(OBJDIR) $(OBJDIR)/version.inc
# libssh2_config.h # libssh2_config.h
test: all test: all
$(MAKE) -C test -f Makefile.mingw $(MAKE) -C test -f GNUmakefile
$(OBJDIR)/%.o: %.c $(OBJDIR)/%.o: %.c
# @echo Compiling $< # @echo Compiling $<
@ -205,7 +205,7 @@ objclean: all
-$(RD) $(OBJDIR) -$(RD) $(OBJDIR)
testclean: clean testclean: clean
$(MAKE) -C test -f Makefile.win32 clean $(MAKE) -C test -f GNUmakefile clean
clean: clean:
# -$(RM) libssh2_config.h # -$(RM) libssh2_config.h
@ -240,7 +240,7 @@ $(OBJDIR)/%.res: %.rc
@$(RC) $(RCFLAGS) $< -o $@ @$(RC) $(RCFLAGS) $< -o $@
$(DISTDIR)/readme.txt: Makefile.win32 $(DISTDIR)/readme.txt: GNUmakefile
@echo Creating $@ @echo Creating $@
@echo $(DL)This is a binary distribution for Win32 platform.$(DL) > $@ @echo $(DL)This is a binary distribution for Win32 platform.$(DL) > $@
@echo $(DL)libssh version $(LIBSSH2_VERSION_STR)$(DL) >> $@ @echo $(DL)libssh version $(LIBSSH2_VERSION_STR)$(DL) >> $@
@ -248,7 +248,7 @@ $(DISTDIR)/readme.txt: Makefile.win32
@echo $(DL)any further documentation:$(DL) >> $@ @echo $(DL)any further documentation:$(DL) >> $@
@echo $(DL)$(WWWURL)$(DL) >> $@ @echo $(DL)$(WWWURL)$(DL) >> $@
$(DEVLDIR)/readme.txt: Makefile.win32 $(DEVLDIR)/readme.txt: GNUmakefile
@echo Creating $@ @echo Creating $@
@echo $(DL)This is a development distribution for Win32 platform.$(DL) > $@ @echo $(DL)This is a development distribution for Win32 platform.$(DL) > $@
@echo $(DL)libssh version $(LIBSSH2_VERSION_STR)$(DL) >> $@ @echo $(DL)libssh version $(LIBSSH2_VERSION_STR)$(DL) >> $@

1
win32/Makefile
Просмотреть файл

@ -1 +0,0 @@
include Makefile.mingw

12
win32/test/Makefile.mingw → win32/test/GNUmakefile
Просмотреть файл

@ -1,9 +1,9 @@
######################################################################### #########################################################################
# #
## Makefile for building libssh2 samples (Win32 version - gnu make) ## Makefile for building libssh2 samples (Win32 version - gnu make)
## Use: make -f Makefile.mingw [help] ## Use: make -f GNUmakefile [help]
## ##
## Comments to: Guenter Knauf http://www.gknw.net/phpbb ## Hacked by: Guenter Knauf
# #
######################################################################### #########################################################################
@ -76,12 +76,6 @@ ifdef METROWERKS
else else
CC = $(CROSSPREFIX)gcc CC = $(CROSSPREFIX)gcc
endif endif
CP = cp -afv
# RM = rm -f
# Here you can find a native Win32 binary of the original awk:
# http://www.gknw.net/development/prgtools/awk-20070501.zip
AWK = awk
ZIP = zip -qzr9
# Global flags for all compilers # Global flags for all compilers
CFLAGS = $(OPT) -D$(DB) -DWIN32 -DLIBSSH2_WIN32 # -DHAVE_CONFIG_H CFLAGS = $(OPT) -D$(DB) -DWIN32 -DLIBSSH2_WIN32 # -DHAVE_CONFIG_H
@ -177,7 +171,7 @@ $(OBJDIR)/%.res: $(OBJDIR)/%.rc
@echo Creating $@ @echo Creating $@
@$(RC) $(RCFLAGS) $< -o $@ @$(RC) $(RCFLAGS) $< -o $@
$(OBJDIR)/%.rc: Makefile.win32 $(OBJDIR)/version.inc $(OBJDIR)/%.rc: GNUmakefile $(OBJDIR)/version.inc
@echo $(DL)1 VERSIONINFO$(DL) > $@ @echo $(DL)1 VERSIONINFO$(DL) > $@
@echo $(DL) FILEVERSION $(LIBSSH2_VERSION),0$(DL) >> $@ @echo $(DL) FILEVERSION $(LIBSSH2_VERSION),0$(DL) >> $@
@echo $(DL) PRODUCTVERSION $(LIBSSH2_VERSION),0$(DL) >> $@ @echo $(DL) PRODUCTVERSION $(LIBSSH2_VERSION),0$(DL) >> $@