From 9436a026e2e23d207fbdcb9e8bc9b076e3573700 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 22 Jan 2011 22:37:50 +0100
Subject: activate GCC cflags check, cleanup FLAGS stuff in OpenADK.

 * remove TCFLAGS/TLDFLAGS/TCPPFLAGS and only use
   TARGET_CFLAGS/TARGET_LDFLAGS/TARGET_CPPFLAGS, ...
 * activate GCC_HONOUR_COPTS and fix all packages to
   honour CFLAGS
 * use CC_FOR_BUILD, CFLAGS_FOR_BUILD, ... for all
   build compilation, remove HOST* variants
 * introduce KERNEL_MODULE_FLAGS for external kernel
   modules
 * mark rpm package as broken, mark syslinux for native builds
   only, mark libhugetlb for eglibc/glibc only usage
---
 package/trafshow/Makefile                  |  5 ++--
 package/trafshow/patches/patch-Makefile_in | 38 ++++++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 6 deletions(-)

(limited to 'package/trafshow')

diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile
index 4ef0d742b..17d9879db 100644
--- a/package/trafshow/Makefile
+++ b/package/trafshow/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		0b2f0bb23b7832138b7d841437b9e182
 PKG_DESCR:=		traffic analyzing tool
 PKG_SECTION:=		net
+PKG_BUILDDEP:=		libpcap ncurses
+PKG_DEPENDS:=		libpcap libncurses libpthread
 PKG_SITES:=		http://www.sfr-fresh.com/linux/misc/
 PKG_NOPARALLEL:=	1
 
@@ -18,8 +20,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TRAFSHOW,trafshow,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS
-TLDFLAGS+=		-pthread
+TARGET_CPPFLAGS+=	-DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS
 
 post-install:
 	${INSTALL_DIR} ${IDIR_TRAFSHOW}/usr/bin
diff --git a/package/trafshow/patches/patch-Makefile_in b/package/trafshow/patches/patch-Makefile_in
index d5562d64c..f3f681f14 100644
--- a/package/trafshow/patches/patch-Makefile_in
+++ b/package/trafshow/patches/patch-Makefile_in
@@ -1,6 +1,32 @@
 --- trafshow-5.2.3.orig/Makefile.in	2004-06-15 10:29:14.000000000 +0200
-+++ trafshow-5.2.3/Makefile.in	2010-02-05 23:07:13.164334256 +0100
-@@ -59,6 +59,8 @@ OBJ	= $(CSRC:.c=.o) $(YSRC:.y=.o) $(LSRC
++++ trafshow-5.2.3/Makefile.in	2011-01-21 23:49:58.988658729 +0100
+@@ -28,21 +28,22 @@ MANDEST = @mandir@
+ 
+ PROG = trafshow
+ CC = @PTHREAD_CC@
+-CFLAGS = @CFLAGS@ -Wall -I. @DEFS@ @PTHREAD_CFLAGS@
++CFLAGS = @CFLAGS@ -Wall @PTHREAD_CFLAGS@
++CPPFLAGS = -I. @DEFS@ @CPPFLAGS@
+ YACC = @YACC@
+ YFLAGS = -d -p `echo $@ | sed -e 's/\..*/_/'`
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LFLAGS =
+ LDFLAGS = @LDFLAGS@
+-LIBS = @PTHREAD_LIBS@ @LIBS@
++LIBS = @PTHREAD_LIBS@ @LIBS@ -pthread
+ 
+ # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
+ # Also, gcc does not remove the .o before forking 'as', which can be a
+ # problem if you don't own the file but can write to the directory.
+ .c.o:
+ 	@rm -f $@
+-	$(CC) $(CFLAGS) -c $*.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c
+ 
+ CSRC	= trafshow.c screen.c colormask.c getkey.c selector.c \
+ 	events.c session.c show_if.c show_stat.c show_dump.c \
+@@ -59,9 +60,11 @@ OBJ	= $(CSRC:.c=.o) $(YSRC:.y=.o) $(LSRC
  
  CLEANFILES = $(PROG) $(OBJ) $(GENSRC) y.tab.h
  
@@ -8,8 +34,12 @@
 +
  $(PROG): $(OBJ)
  	@rm -f $@
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
-@@ -73,9 +75,9 @@ version.c: VERSION Makefile
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
++	$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+ 
+ $(OBJ): config.h trafshow.h Makefile
+ version.o: version.c
+@@ -73,9 +76,9 @@ version.c: VERSION Makefile
  	@echo 'char compiled[] = "$(CC) $(CFLAGS) $(LIBS)";' >> $@
  
  install:
-- 
cgit v1.2.3