diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-24 14:04:43 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-24 14:04:43 +0100 |
commit | 573b06af740b3f1966aa2ea190494d9c87270786 (patch) | |
tree | d2f5dd29803ad5bbca171bfff9b1ece4ef3d5b3c /package/trafshow/patches/patch-Makefile_in | |
parent | 42ed8eb00eba8691994588b7fca5dbd04d92a59c (diff) | |
parent | 3953de124e87ce3b594fd861b6f111b2df706753 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/trafshow/patches/patch-Makefile_in')
-rw-r--r-- | package/trafshow/patches/patch-Makefile_in | 38 |
1 files changed, 34 insertions, 4 deletions
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: |