From a3f0c649f09f7e90073f32cf5beaeb44df65b5df Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Wed, 15 Oct 2008 09:13:05 +0000 Subject: [PATCH] Automatically define the UIP_CONF_IPV6 C preprocessor macro if the UIP_CONF_IPV6 make variable is defined - not the nicest way of doing this, but ought to work for now... --- Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.include b/Makefile.include index 35503e66c..1b420a560 100644 --- a/Makefile.include +++ b/Makefile.include @@ -44,12 +44,13 @@ endif include $(CONTIKI)/core/net/rime/Makefile.rime include $(CONTIKI)/core/net/mac/Makefile.mac -#include $(CONTIKI)/core/net/ipv6/Makefile.ipv6 SYSTEM = process.c procinit.c autostart.c elfloader.c profile.c timetable.c timetable-aggregate.c THREADS = mt.c LIBS = memb.c timer.c list.c etimer.c energest.c rtimer.c stimer.c \ print-stats.c ifft.c crc16.c random.c + ifdef UIP_CONF_IPV6 +CFLAGS+=-DUIP_CONF_IPV6=1 UIP = uip6.c tcpip.c psock.c uip-udp-packet.c uip-split.c \ uip-over-mesh.c resolv.c hc.c tcpdump.c uiplib.c NET = $(UIP) uip-icmp6.c uip-nd6.c uip-nd6-io.c uip-netif.c sicslowpan.c @@ -59,6 +60,7 @@ UIP = uip.c uiplib.c resolv.c tcpip.c psock.c hc.c uip-split.c uip-fw.c \ uip-over-mesh.c #rawpacket-udp.c NET = $(UIP) uaodv.c uaodv-rt.c endif # UIP_CONF_IPV6 + CTK = ctk.c CTKVNC = $(CTK) ctk-vncserver.c libconio.c vnc-server.c vnc-out.c ctk-vncfont.c