Sophie

Sophie

distrib > Mandriva > 2007.0 > x86_64 > media > contrib-release-src > by-pkgid > 91ebd4ebc5640b3ec611e2352f3b5010 > files > 2

gtkwave-3.0.10-2mdv2007.0.src.rpm

--- gtkwave-3.0.10/src/helpers/Makefile.in.system-libs	2006-08-04 18:13:54.000000000 +0200
+++ gtkwave-3.0.10/src/helpers/Makefile.in	2006-08-24 17:33:47.000000000 +0200
@@ -1,7 +1,7 @@
 CC = @CC@
 BIGFILES = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 AIXFLAGS = -bmaxdata:0x80000000
-CFLAGS = -O2 -I../libz -I../libbz2
+CFLAGS = -O2
 DEBUGS =
 
 all:	mvlbin
@@ -11,8 +11,8 @@ clean:
 	rm -rf lxt2vcd vcd2lxt2 vzt2vcd vcd2vzt ../../bin/lxt2vcd ../../bin/vcd2lxt2 ../../bin/vzt2vcd ../../bin/vcd2vzt
 	rm -rf vztminer lxt2miner ../../bin/vztminer ../../bin/lxt2miner
 	rm -rf tla2vcd ../../bin/tla2vcd ghwdump ../../bin/ghwdump shmidcat ../../bin/shmidcat
-	cd ../libz ; make clean
-	cd ../libbz2 ; make clean
+	cd $(libdir) ; make clean
+	cd $(libdir) ; make clean
 
 mvlbin: mvl2vcd mvl2lxt tex2vcd vcd2lxt lxt2vcd vcd2lxt2 vzt2vcd vcd2vzt vztminer lxt2miner tla2vcd ghwdump shmidcat
 	cp mvl2vcd  ../../bin; cp tex2vcd ../../bin; cp mvl2lxt  ../../bin; cp vcd2lxt  ../../bin; 
@@ -44,41 +44,41 @@ v2l_debug.o: v2l_debug.c v2l_debug.h v2l
 
 mvl2lxt.o: mvl2lxt.c 
 	$(CC) $(CFLAGS) -c mvl2lxt.c
-mvl2lxt: mvl2lxt.o lxt_write.o ../libz/libz.a ../libbz2/libbz2.a
-	$(CC) $(CFLAGS) -o mvl2lxt mvl2lxt.o lxt_write.o ../libz/libz.a ../libbz2/libbz2.a
+mvl2lxt: mvl2lxt.o lxt_write.o $(libdir)/libz.a $(libdir)/libbz2.a
+	$(CC) $(CFLAGS) -o mvl2lxt mvl2lxt.o lxt_write.o $(libdir)/libz.a $(libdir)/libbz2.a
 
 tex2vcd: tex2vcd.c
 	$(CC) $(CFLAGS) -o tex2vcd tex2vcd.c
 
-vcd2lxt: vcd2lxt.c lxt_write.o v2l_debug.o ../libz/libz.a ../libbz2/libbz2.a
-	$(CC) $(CFLAGS) -o vcd2lxt vcd2lxt.c lxt_write.o v2l_debug.o ../libz/libz.a ../libbz2/libbz2.a
+vcd2lxt: vcd2lxt.c lxt_write.o v2l_debug.o $(libdir)/libz.a $(libdir)/libbz2.a
+	$(CC) $(CFLAGS) -o vcd2lxt vcd2lxt.c lxt_write.o v2l_debug.o $(libdir)/libz.a $(libdir)/libbz2.a
 
-lxt2vcd: lxt2_read.o lxt2vcd.c scopenav.o ../libz/libz.a
-	$(CC) $(CFLAGS) -o lxt2vcd lxt2vcd.c lxt2_read.o scopenav.o ../libz/libz.a
+lxt2vcd: lxt2_read.o lxt2vcd.c scopenav.o $(libdir)/libz.a
+	$(CC) $(CFLAGS) -o lxt2vcd lxt2vcd.c lxt2_read.o scopenav.o $(libdir)/libz.a
 
-vcd2lxt2: vcd2lxt2.c lxt2_write.o v2l_debug_lxt2.o ../libz/libz.a
-	$(CC) $(CFLAGS) -o vcd2lxt2 vcd2lxt2.c lxt2_write.o v2l_debug_lxt2.o ../libz/libz.a
+vcd2lxt2: vcd2lxt2.c lxt2_write.o v2l_debug_lxt2.o $(libdir)/libz.a
+	$(CC) $(CFLAGS) -o vcd2lxt2 vcd2lxt2.c lxt2_write.o v2l_debug_lxt2.o $(libdir)/libz.a
 
-vzt2vcd: vzt_read.o vzt2vcd.c scopenav.o ../libz/libz.a ../libbz2/libbz2.a
-	$(CC) $(CFLAGS) -o vzt2vcd vzt2vcd.c vzt_read.o scopenav.o ../libz/libz.a ../libbz2/libbz2.a -lpthread
+vzt2vcd: vzt_read.o vzt2vcd.c scopenav.o $(libdir)/libz.a $(libdir)/libbz2.a
+	$(CC) $(CFLAGS) -o vzt2vcd vzt2vcd.c vzt_read.o scopenav.o $(libdir)/libz.a $(libdir)/libbz2.a -lpthread
 
-vcd2vzt: vcd2vzt.c vzt_write.o v2l_debug_lxt2.o ../libz/libz.a
-	$(CC) $(CFLAGS) -o vcd2vzt vcd2vzt.c vzt_write.o v2l_debug_lxt2.o ../libz/libz.a ../libbz2/libbz2.a
+vcd2vzt: vcd2vzt.c vzt_write.o v2l_debug_lxt2.o $(libdir)/libz.a
+	$(CC) $(CFLAGS) -o vcd2vzt vcd2vzt.c vzt_write.o v2l_debug_lxt2.o $(libdir)/libz.a $(libdir)/libbz2.a
 
-vztminer: vztminer.c vzt_read.o ../libz/libz.a ../libbz2/libbz2.a
-	$(CC) $(CFLAGS) -o vztminer vztminer.c vzt_read.o ../libz/libz.a ../libbz2/libbz2.a -lpthread
+vztminer: vztminer.c vzt_read.o $(libdir)/libz.a $(libdir)/libbz2.a
+	$(CC) $(CFLAGS) -o vztminer vztminer.c vzt_read.o $(libdir)/libz.a $(libdir)/libbz2.a -lpthread
 
-lxt2miner: lxt2miner.c lxt2_read.o ../libz/libz.a
-	$(CC) $(CFLAGS) -o lxt2miner lxt2miner.c lxt2_read.o ../libz/libz.a
+lxt2miner: lxt2miner.c lxt2_read.o $(libdir)/libz.a
+	$(CC) $(CFLAGS) -o lxt2miner lxt2miner.c lxt2_read.o $(libdir)/libz.a
 
-tla2vcd: tla2vcd.c ../gnu_regex.c ../gnu_regex.h ../libz/libz.a
-	$(CC) $(CFLAGS) -o tla2vcd tla2vcd.c ../gnu_regex.c ../libz/libz.a
+tla2vcd: tla2vcd.c ../gnu_regex.c ../gnu_regex.h $(libdir)/libz.a
+	$(CC) $(CFLAGS) -o tla2vcd tla2vcd.c ../gnu_regex.c $(libdir)/libz.a
 
 ghwdump: ghwdump.c ../ghwlib.c
 	$(CC) $(CFLAGS) -I../ -o ghwdump ghwdump.c ../ghwlib.c 
 
-../libz/libz.a:
-	cd ../libz ; make
+$(libdir)/libz.a:
+	cd $(libdir) ; make
 
-../libbz2/libbz2.a:
-	cd ../libbz2 ; make
+$(libdir)/libbz2.a:
+	cd $(libdir) ; make
--- gtkwave-3.0.10/src/Makefile_GTK2.in.system-libs	2006-08-17 20:19:24.000000000 +0200
+++ gtkwave-3.0.10/src/Makefile_GTK2.in	2006-08-24 17:21:42.000000000 +0200
@@ -1,7 +1,7 @@
 CC = @CC@
 AIXFLAGS = -bmaxdata:0x80000000 -D_WAVE_BE32
 BIGFILES = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS = -O2 -DGTK_ENABLE_BROKEN -DWAVE_USE_GTK2 -I./libz -I./libbz2 -I./helpers
+CFLAGS = -O2 -DGTK_ENABLE_BROKEN -DWAVE_USE_GTK2 -I./helpers
 DEBUGS = -DDEBUG_FACILITIES -DDEBUG_PRINTF -DDEBUG_MALLOC -DSTRICT_VCD_ONLY -DDEBUG_MALLOC_LINES
 AET2LIB =
 PTHLIB = -lpthread
@@ -40,8 +40,8 @@ all: 	gtkwave twinwave
 	cp gtkwave ../bin
 	cp twinwave ../bin
 
-gtkwave:$(OBJS) libz/libz.a libbz2/libbz2.a
-	$(CC) $(CFLAGS) $(OBJS) `pkg-config gtk+-2.0 --libs` $(AET2LIB) libz/libz.a libbz2/libbz2.a -o gtkwave $(PTHLIB)
+gtkwave:$(OBJS)
+	$(CC) $(CFLAGS) $(OBJS) `pkg-config gtk+-2.0 --libs` $(AET2LIB) $(libdir)/libz.a $(libdir)/libbz2.a -o gtkwave $(PTHLIB)
 
 twinwave: twinwave.c
 	$(CC) $(CFLAGS) `pkg-config gtk+-2.0 --cflags` `pkg-config gtk+-2.0 --libs` -o twinwave twinwave.c
--- gtkwave-3.0.10/contrib/rtlbrowse/Makefile_GTK2.in.system-libs	2006-05-09 07:20:52.000000000 +0200
+++ gtkwave-3.0.10/contrib/rtlbrowse/Makefile_GTK2.in	2006-08-24 17:21:42.000000000 +0200
@@ -3,7 +3,7 @@ LEX = @LEX@
 
 AIXFLAGS = -bmaxdata:0x80000000 -D_WAVE_BE32
 BIGFILES = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS = -O2 -DWAVE_USE_GTK2 -DGTK_ENABLE_BROKEN `pkg-config gtk+-2.0 --cflags` -I../../src/libz -I../../src/libbz2 -I../../src/helpers
+CFLAGS = -O2 -DWAVE_USE_GTK2 -DGTK_ENABLE_BROKEN `pkg-config gtk+-2.0 --cflags` -I../../src/helpers
 LDFLAGS= `pkg-config gtk+-2.0 --libs`
 DEBUGS =
 AET2LIB =
@@ -22,8 +22,8 @@ all: 	rtlbrowse
 ../../src/libbz2/libbz2.a:
 	cd ../../src/libbz2 ; make
 
-rtlbrowse: $(OBJS) lex.yy.o ../../src/libz/libz.a ../../src/libbz2/libbz2.a
-	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) lex.yy.o $(AET2LIB) ../../src/libz/libz.a ../../src/libbz2/libbz2.a -o rtlbrowse $(PTHLIB)
+rtlbrowse: $(OBJS) lex.yy.o
+	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) lex.yy.o $(AET2LIB) $(libdir)/libz.a $(libdir)/libbz2.a -o rtlbrowse $(PTHLIB)
 
 .c.o:	$(H_FILES)
 	$(CC) $(CFLAGS) -c -o $@ $<

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional