[Nettle-commits] CVS: nettle GNUmakefile,1.1,1.2

[Alex M. S. <arc...@us...>]

Update of /cvsroot/nettle/nettle
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20419

Modified Files:
	GNUmakefile 
Log Message:
Largely commit James Bursa's changes for SSH support - some slight tweaks to the code in c/wimp which was preventing it building with Norcroft, and I've removed the \!Run wimpslot changes for the time being (I guess I'd like to do something clever based on whether it's Norcroft-built or gcc-built). Doesn't quite seem to work for me as-is (claims to be missing ciphers), but I don't think that's directly caused by anything in this patch.

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/nettle/nettle/GNUmakefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GNUmakefile	29 Aug 2010 19:45:29 -0000	1.1
--- GNUmakefile	21 Sep 2010 17:46:13 -0000	1.2
***************
*** 5,8 ****
--- 5,9 ----
  CC = /home/riscos/cross/bin/arm-unknown-riscos-gcc
  CFLAGS = -c -std=c9x -Wall -mpoke-function-name -I/home/riscos/env/include
+ CONFIG = -DWITH_SSH
  
  LIBS = -L/home/riscos/env/lib -lssh2 -lgcrypt -lgpg-error
***************
*** 27,37 ****
  RunImage,e1f: $(OBJS)
  	@echo "    LINK:" $@
! 	@$(CC) -o $@ $(OBJS) $(LIBS)
  
! $(OBJS): $(HEADERS)
  
  %.o: %.c
  	@echo " COMPILE:" $<
! 	@$(CC) $(CFLAGS) -o $@ $<
  
  # intentionally compiled using native compiler
--- 28,38 ----
  RunImage,e1f: $(OBJS)
  	@echo "    LINK:" $@
! 	@$(CC) -static -o $@ $(OBJS) $(LIBS)
  
! $(OBJS): $(HEADERS) GNUmakefile
  
  %.o: %.c
  	@echo " COMPILE:" $<
! 	@$(CC) $(CFLAGS) $(CONFIG) -o $@ $<
  
  # intentionally compiled using native compiler