[Olsr-cvs] olsrd-current/src/olsr_switch Makefile,1.6,1.7

[Bruno Randolf]

Update of /cvsroot/olsrd/olsrd-current/src/olsr_switch
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16245/src/olsr_switch

Modified Files:
	Makefile 
Log Message:
no need to doy everything yourself - just include Makefile.inc


Index: Makefile
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/olsr_switch/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile	31 May 2005 20:37:00 -0000	1.6
--- Makefile	2 Jun 2005 14:01:29 -0000	1.7
***************
*** 1,52 ****
  
! CC ?= gcc
! BINNAME = olsr_switch
! INCLUDES += -I./..
! CFLAGS += -O2 -g $(INCLUDES) -Wall -MD  -Wmissing-prototypes -Wstrict-prototypes \
! 	-Wmissing-declarations -Wsign-compare
! LDFLAGS +=
! TOPDIR = ../../
! 
! SRCS =	$(wildcard *.c)
! HDRS =	$(wildcard *.h)
! OBJS =	$(patsubst %.c,%.o,$(SRCS))
! 
! 
! # OS detection
! OS =		$(shell sh $(TOPDIR)/make/guess_os.sh)
! ifeq ($(OS),UNKNOWN)
! all: help
! else
! ifeq ($(OS),win32)
! WIN32 = 1
! endif
! all: default_target
! endif
! 
! help:
! 	@echo 
! 	@echo '***** olsr.org olsr_switch Make ****'
! 	@echo ' Automatic detection of your OS     '
! 	@echo ' failed!                            '
! 	@echo '************************************'
! 	@echo
! 
! 
! # include dependencies
! -include $(SRCS:%.c=%.d)
! 
! ifdef WIN32
  BINNAME = olsr_switch.exe
! CFLAGS += -DWIN32 -mno-cygwin
! INCLUDES += -I./../win32/
! SRCS +=	$(TOPDIR)src/win32/compat.c
! LIBS += -mno-cygwin -lws2_32 -liphlpapi
  endif
  
  default_target:	$(OBJS)
! 	$(CC) $(LDFLAGS) -o $(TOPDIR)$(BINNAME) $(OBJS) $(LIBS)
  
  clean:
  	rm -f *.o *.d
  	rm -f *~
! 	rm -f $(TOPDIR)$(BINNAME)
--- 1,16 ----
+ TOPDIR=../..
+ include $(TOPDIR)/Makefile.inc
  
! ifeq ($(OS), win32)
  BINNAME = olsr_switch.exe
! else
! BINNAME = olsr_switch
  endif
  
  default_target:	$(OBJS)
! 	$(CC) $(LDFLAGS) -o $(TOPDIR)/$(BINNAME) $(OBJS) $(LIBS)
  
  clean:
  	rm -f *.o *.d
  	rm -f *~
! 	rm -f $(TOPDIR)/$(BINNAME)