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

some more NetWare makefile fixes.

Browse Source
This commit is contained in:
Guenter Knauf 2009-09-06 06:31:59 +02:00
parent 1f8d58a4ce
commit a04a0b6c69
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nw/Makefile.netware
View File

@ -492,6 +492,7 @@ endif
@echo $(DL) libssh2_channel_eof,$(DL) >> $@ @echo $(DL) libssh2_channel_eof,$(DL) >> $@
@echo $(DL) libssh2_channel_flush_ex,$(DL) >> $@ @echo $(DL) libssh2_channel_flush_ex,$(DL) >> $@
@echo $(DL) libssh2_channel_free,$(DL) >> $@ @echo $(DL) libssh2_channel_free,$(DL) >> $@
@echo $(DL) libssh2_channel_get_exit_status,$(DL) >> $@
@echo $(DL) libssh2_channel_open_ex,$(DL) >> $@ @echo $(DL) libssh2_channel_open_ex,$(DL) >> $@
@echo $(DL) libssh2_channel_process_startup,$(DL) >> $@ @echo $(DL) libssh2_channel_process_startup,$(DL) >> $@
@echo $(DL) libssh2_channel_read_ex,$(DL) >> $@ @echo $(DL) libssh2_channel_read_ex,$(DL) >> $@
@ -507,6 +508,7 @@ endif
@echo $(DL) libssh2_scp_send_ex,$(DL) >> $@ @echo $(DL) libssh2_scp_send_ex,$(DL) >> $@
@echo $(DL) libssh2_knownhost_add,$(DL) >> $@ @echo $(DL) libssh2_knownhost_add,$(DL) >> $@
@echo $(DL) libssh2_knownhost_check,$(DL) >> $@ @echo $(DL) libssh2_knownhost_check,$(DL) >> $@
@echo $(DL) libssh2_knownhost_free,$(DL) >> $@
@echo $(DL) libssh2_knownhost_init,$(DL) >> $@ @echo $(DL) libssh2_knownhost_init,$(DL) >> $@
@echo $(DL) libssh2_knownhost_readfile,$(DL) >> $@ @echo $(DL) libssh2_knownhost_readfile,$(DL) >> $@
@echo $(DL) libssh2_knownhost_writefile,$(DL) >> $@ @echo $(DL) libssh2_knownhost_writefile,$(DL) >> $@

21
nw/test/Makefile.netware
View File

@ -29,7 +29,7 @@ LINK_STATIC = 1
# Edit the vars below to change NLM target settings. # Edit the vars below to change NLM target settings.
SAMPLES = ../../example/simple SAMPLES = ../../example/simple
TARGETS := $(patsubst $(SAMPLES)/%.c,%.nlm,$(strip $(wildcard $(SAMPLES)/*.c))) TARGETS := $(filter-out x11.nlm,$(patsubst $(SAMPLES)/%.c,%.nlm,$(strip $(wildcard $(SAMPLES)/*.c))))
VERSION = $(LIBSSH2_VERSION) VERSION = $(LIBSSH2_VERSION)
COPYR = Copyright (c) 2004-2009, Sara Golemon <sarag@libssh2.org> COPYR = Copyright (c) 2004-2009, Sara Golemon <sarag@libssh2.org>
WWWURL = http://www.libssh2.org/ WWWURL = http://www.libssh2.org/
@ -89,7 +89,7 @@ LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH))
-include $(OBJDIR)/version.inc -include $(OBJDIR)/version.inc
# Global flags for all compilers # Global flags for all compilers
CFLAGS = $(OPT) -D$(DB) -DNETWARE -nostdinc CFLAGS += $(OPT) -D$(DB) -DNETWARE -nostdinc
ifeq ($(CC),mwccnlm) ifeq ($(CC),mwccnlm)
LD = mwldnlm LD = mwldnlm
@ -116,8 +116,8 @@ LDFLAGS = -T
AR = ar AR = ar
ARFLAGS = -cq ARFLAGS = -cq
LIBEXT = a LIBEXT = a
CFLAGS += -fno-builtin -fpack-struct -fpcc-struct-return -fno-strict-aliasing CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing
CFLAGS += -Wall,no-unused # -pedantic CFLAGS += -Wall # -pedantic
ifeq ($(LIBARCH),LIBC) ifeq ($(LIBARCH),LIBC)
PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
else else
@ -177,8 +177,11 @@ ifeq ($(MTSAFE),NO)
XDCOPT = -u XDCOPT = -u
endif endif
ifeq ($(findstring linux,$(OSTYPE)),linux) ifeq ($(findstring /sh,$(SHELL)),/sh)
DL = ' DL = '
DS = /
else
DS = \\
endif endif
vpath %.c $(SAMPLES) vpath %.c $(SAMPLES)
@ -188,7 +191,7 @@ vpath %.c $(SAMPLES)
all: prebuild $(TARGETS) all: prebuild $(TARGETS)
prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h prebuild: $(OBJDIR) $(OBJDIR)/version.inc
$(OBJDIR)/%.o: %.c $(OBJDIR)/%.o: %.c
# @echo Compiling $< # @echo Compiling $<
@ -276,7 +279,7 @@ ifdef IMPORTS
@echo $(DL)import $(IMPORTS)$(DL) >> $@ @echo $(DL)import $(IMPORTS)$(DL) >> $@
endif endif
ifeq ($(LD),nlmconv) ifeq ($(LD),nlmconv)
@echo $(DL)input $(<:.def=.o)$(DL) >> $@ @echo $(DL)input $(@:.def=.o)$(DL) >> $@
@echo $(DL)input $(PRELUDE)$(DL) >> $@ @echo $(DL)input $(PRELUDE)$(DL) >> $@
ifdef LDLIBS ifdef LDLIBS
@echo $(DL)input $(LDLIBS)$(DL) >> $@ @echo $(DL)input $(LDLIBS)$(DL) >> $@
@ -284,7 +287,7 @@ endif
@echo $(DL)output $(notdir $(@:.def=.nlm))$(DL) >> $@ @echo $(DL)output $(notdir $(@:.def=.nlm))$(DL) >> $@
endif endif
config.h: Makefile.netware ssh2_config.h: Makefile.netware
@echo Creating $@ @echo Creating $@
@echo $(DL)/* $@ for NetWare target.$(DL) > $@ @echo $(DL)/* $@ for NetWare target.$(DL) > $@
@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@ @echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@