rpms/pards/devel pards-0.4.patch, NONE, 1.1 pards.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

HASEGAWA Masahiro (masahase) fedora-extras-commits at redhat.com
Mon Jan 14 00:36:16 UTC 2008


Author: masahase

Update of /cvs/pkgs/rpms/pards/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23130/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pards-0.4.patch pards.spec 
Log Message:
Initial import.


pards-0.4.patch:

--- NEW FILE pards-0.4.patch ---
diff -uNr pards/bzip2-1.0.3/Makefile pards-patch/bzip2-1.0.3/Makefile
--- pards/bzip2-1.0.3/Makefile	2007-01-12 01:29:36.000000000 +0900
+++ pards-patch/bzip2-1.0.3/Makefile	2008-01-07 03:12:23.000000000 +0900
@@ -10,9 +10,7 @@
 CPP=g++
 AR=ar
 RANLIB=ranlib
-PARDSLIBPATH=../src/
-PARDSLDFLAGS=-L$(PARDSLIBPATH) -lpards
-PARDSINCFLAGS=-I$(PARDSLIBPATH)
+PARDSLDFLAGS=-lpards
 
 BIGFILES=-D_FILE_OFFSET_BITS=64
 CFLAGS=-Wall -Winline -O -g $(BIGFILES)
@@ -36,11 +34,11 @@
 wpbzip2: libbz2.a wpbzip2.o 
 	$(CPP) $(CFLAGS) $(LDFLAGS) -o wpbzip2 wpbzip2.o -L. -lbz2 $(PARDSLDFLAGS)
 
-pbzip2.o: pbzip2.c $(PARDSLIBPATH)SyncQueue.h $(PARDSLIBPATH)SyncList.h $(PARDSLIBPATH)Sync.h
-	$(CPP) $(CFLAGS) -c pbzip2.c $(PARDSINCFLAGS)
+pbzip2.o: pbzip2.c 
+	$(CPP) $(CFLAGS) -c pbzip2.c
 
-wpbzip2.o: wpbzip2.c $(PARDSLIBPATH)SyncQueue.h $(PARDSLIBPATH)SyncList.h $(PARDSLIBPATH)Sync.h $(PARDSLIBPATH)WorkPool.h
-	$(CPP) $(CFLAGS) -c wpbzip2.c $(PARDSINCFLAGS)
+wpbzip2.o: wpbzip2.c
+	$(CPP) $(CFLAGS) -c wpbzip2.c
 
 all: libbz2.a bzip2 bzip2recover test pbzip2
 
diff -uNr pards/bzip2-1.0.3/pbzip2.c pards-patch/bzip2-1.0.3/pbzip2.c
--- pards/bzip2-1.0.3/pbzip2.c	2006-12-31 14:54:28.000000000 +0900
+++ pards-patch/bzip2-1.0.3/pbzip2.c	2008-01-07 03:08:57.000000000 +0900
@@ -248,7 +248,7 @@
 
 #endif /* BZ_LCCWIN32 */
 
-#include "SyncQueue.h"
+#include <pards/SyncQueue.h>
 
 /*---------------------------------------------*/
 /*--
diff -uNr pards/bzip2-1.0.3/wpbzip2.c pards-patch/bzip2-1.0.3/wpbzip2.c
--- pards/bzip2-1.0.3/wpbzip2.c	2007-02-12 22:52:28.000000000 +0900
+++ pards-patch/bzip2-1.0.3/wpbzip2.c	2008-01-07 03:08:57.000000000 +0900
@@ -248,8 +248,8 @@
 
 #endif /* BZ_LCCWIN32 */
 
-#include "SyncQueue.h"
-#include "WorkPool.h"
+#include <pards/SyncQueue.h>
+#include <pards/WorkPool.h>
 
 /*---------------------------------------------*/
 /*--
diff -uNr pards/gtk/Makefile pards-patch/gtk/Makefile
--- pards/gtk/Makefile	2007-03-18 22:22:28.000000000 +0900
+++ pards-patch/gtk/Makefile	2008-01-07 03:13:16.000000000 +0900
@@ -2,9 +2,8 @@
 AR=ar
 RANLIB=ranlib
 CFLAGS=-O2 -g -Wall
-LIBPATH=../src/
-LDFLAGS=-L$(LIBPATH) -lpards -L. -lgtkhelper
-INCFLAGS=-I$(LIBPATH) -I.
+LDFLAGS=-lpards -L. -lgtkhelper
+INCFLAGS=-I.
 GTKFLAGS=`pkg-config --cflags --libs gtk+-2.0`
 GTKINCFLAGS=`pkg-config --cflags gtk+-2.0`
 
diff -uNr pards/gtk/gtksample.cc pards-patch/gtk/gtksample.cc
--- pards/gtk/gtksample.cc	2007-03-15 23:58:05.000000000 +0900
+++ pards-patch/gtk/gtksample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -3,8 +3,8 @@
 #include <gtk/gtk.h>
 #include "libgtkhelper.h"
 
-#include "SyncQueue.h"
-#include "Merger.h"
+#include <pards/SyncQueue.h>
+#include <pards/Merger.h>
 
 #define NCHARS 1000
 
diff -uNr pards/gtk/libgtkhelper.h pards-patch/gtk/libgtkhelper.h
--- pards/gtk/libgtkhelper.h	2007-02-24 19:35:33.000000000 +0900
+++ pards-patch/gtk/libgtkhelper.h	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "SyncList.h"
+#include <pards/SyncList.h>
 
 class Callback{
 public:
diff -uNr pards/misc/Makefile pards-patch/misc/Makefile
--- pards/misc/Makefile	2006-11-26 15:35:52.000000000 +0900
+++ pards-patch/misc/Makefile	2008-01-07 03:13:52.000000000 +0900
@@ -3,9 +3,7 @@
 AR=ar
 RANLIB=ranlib
 CFLAGS=-O2 -g -Wall
-LIBPATH=../src/
-LDFLAGS=-L$(LIBPATH) -lpards
-INCFLAGS=-I$(LIBPATH)
+LDFLAGS=-lpards
 
 all: pthread fork overhead
 
@@ -15,8 +13,8 @@
 pthread: pthread.c
 	$(CC) $(CFLAGS) -o pthread pthread.c -lpthread
 
-overhead: overhead.cc $(LIBPATH)Sync.h
-	$(CPP) $(CFLAGS) -o overhead overhead.cc $(INCFLAGS) $(LDFLAGS)
+overhead: overhead.cc
+	$(CPP) $(CFLAGS) -o overhead overhead.cc $(LDFLAGS)
 
 semget: semget.c
 	$(CC) $(CFLAGS) -o semget semget.c
diff -uNr pards/misc/overhead.cc pards-patch/misc/overhead.cc
--- pards/misc/overhead.cc	2006-11-26 15:35:52.000000000 +0900
+++ pards-patch/misc/overhead.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "Sync.h"
+#include <pards/Sync.h>
 
 int main(int argc, char* argv[])
 {
diff -uNr pards/samples/Makefile pards-patch/samples/Makefile
--- pards/samples/Makefile	2007-08-25 21:16:39.000000000 +0900
+++ pards-patch/samples/Makefile	2008-01-07 03:18:13.000000000 +0900
@@ -2,67 +2,65 @@
 AR=ar
 RANLIB=ranlib
 CFLAGS= -O2 -g -Wall
-LIBPATH=../src/
-LDFLAGS=-L$(LIBPATH) -lpards
-INCFLAGS=-I$(LIBPATH)
+LDFLAGS=-lpards
 
 all: sample qu fib qsort listsample listsample2 queuesample workpoolsample spmdsample spmdmatmul timedreadsample timedlistsample timedqueuesample intrreadsample intrlistsample intrqueuesample mergersample mergersample2 intrputsample timedputsample
 
-sample: sample.cc $(LIBPATH)Sync.h
-	$(CPP) $(CFLAGS) -o sample sample.cc $(INCFLAGS) $(LDFLAGS) 
+sample: sample.cc
+	$(CPP) $(CFLAGS) -o sample sample.cc $(LDFLAGS) 
 
-qu: qu.cc $(LIBPATH)SyncList.h
-	$(CPP) $(CFLAGS) -o qu qu.cc $(INCFLAGS) $(LDFLAGS) 
+qu: qu.cc
+	$(CPP) $(CFLAGS) -o qu qu.cc $(LDFLAGS) 
 
-fib: fib.cc $(LIBPATH)Sync.h
-	$(CPP) $(CFLAGS) -o fib fib.cc $(INCFLAGS) $(LDFLAGS) 
+fib: fib.cc
+	$(CPP) $(CFLAGS) -o fib fib.cc $(LDFLAGS) 
 
-qsort: qsort.cc $(LIBPATH)Sync.h
-	$(CPP) $(CFLAGS) -o qsort qsort.cc $(INCFLAGS) $(LDFLAGS) 
+qsort: qsort.cc
+	$(CPP) $(CFLAGS) -o qsort qsort.cc $(LDFLAGS) 
 
-listsample: listsample.cc $(LIBPATH)SyncList.h $(LIBPATH)Sync.h
-	$(CPP) $(CFLAGS) -o listsample listsample.cc $(INCFLAGS) $(LDFLAGS) 
+listsample: listsample.cc
+	$(CPP) $(CFLAGS) -o listsample listsample.cc $(LDFLAGS) 
 
-listsample2: listsample2.cc $(LIBPATH)SyncList.h $(LIBPATH)Sync.h
-	$(CPP) $(CFLAGS) -o listsample2 listsample2.cc $(INCFLAGS) $(LDFLAGS)
+listsample2: listsample2.cc
+	$(CPP) $(CFLAGS) -o listsample2 listsample2.cc $(LDFLAGS)
 
-queuesample: queuesample.cc $(LIBPATH)SyncQueue.h $(LIBPATH)SyncList.h $(LIBPATH)Sync.h
-	$(CPP) $(CFLAGS) -o queuesample queuesample.cc $(INCFLAGS) $(LDFLAGS)
+queuesample: queuesample.cc
+	$(CPP) $(CFLAGS) -o queuesample queuesample.cc $(LDFLAGS)
 
-workpoolsample: workpoolsample.cc $(LIBPATH)WorkPool.h $(LIBPATH)SyncQueue.h $(LIBPATH)SyncList.h $(LIBPATH)Sync.h
-	$(CPP) $(CFLAGS) -o workpoolsample workpoolsample.cc $(INCFLAGS) $(LDFLAGS)
+workpoolsample: workpoolsample.cc
+	$(CPP) $(CFLAGS) -o workpoolsample workpoolsample.cc $(LDFLAGS)
 
-spmdsample: spmdsample.cc $(LIBPATH)libpards.h $(LIBPATH)parblock.h
-	$(CPP) $(CFLAGS) -o spmdsample spmdsample.cc $(INCFLAGS) $(LDFLAGS) 
+spmdsample: spmdsample.cc
+	$(CPP) $(CFLAGS) -o spmdsample spmdsample.cc $(LDFLAGS) 
 
-spmdmatmul: spmdmatmul.cc $(LIBPATH)libpards.h $(LIBPATH)parblock.h
-	$(CPP) $(CFLAGS) -o spmdmatmul spmdmatmul.cc $(INCFLAGS) $(LDFLAGS) 
+spmdmatmul: spmdmatmul.cc
+	$(CPP) $(CFLAGS) -o spmdmatmul spmdmatmul.cc $(LDFLAGS) 
 
-timedreadsample: timedreadsample.cc $(LIBPATH)libpards.h $(LIBPATH)Sync.h
-	$(CPP) $(CFLAGS) -o timedreadsample timedreadsample.cc $(INCFLAGS) $(LDFLAGS) 
+timedreadsample: timedreadsample.cc
+	$(CPP) $(CFLAGS) -o timedreadsample timedreadsample.cc $(LDFLAGS) 
 
-intrreadsample: intrreadsample.cc $(LIBPATH)libpards.h $(LIBPATH)Sync.h
-	$(CPP) $(CFLAGS) -o intrreadsample intrreadsample.cc $(INCFLAGS) $(LDFLAGS) 
+intrreadsample: intrreadsample.cc
+	$(CPP) $(CFLAGS) -o intrreadsample intrreadsample.cc $(LDFLAGS) 
 
-intrlistsample: intrlistsample.cc $(LIBPATH)libpards.h $(LIBPATH)Sync.h
-	$(CPP) $(CFLAGS) -o intrlistsample intrlistsample.cc $(INCFLAGS) $(LDFLAGS) 
-intrqueuesample: intrqueuesample.cc $(LIBPATH)libpards.h $(LIBPATH)Sync.h
-	$(CPP) $(CFLAGS) -o intrqueuesample intrqueuesample.cc $(INCFLAGS) $(LDFLAGS) 
+intrlistsample: intrlistsample.cc
+	$(CPP) $(CFLAGS) -o intrlistsample intrlistsample.cc $(LDFLAGS) 
+intrqueuesample: intrqueuesample.cc
+	$(CPP) $(CFLAGS) -o intrqueuesample intrqueuesample.cc $(LDFLAGS) 
 
-timedlistsample: timedlistsample.cc $(LIBPATH)libpards.h $(LIBPATH)Sync.h $(LIBPATH)SyncList.h
-	$(CPP) $(CFLAGS) -o timedlistsample timedlistsample.cc $(INCFLAGS) $(LDFLAGS) 
+timedlistsample: timedlistsample.cc
+	$(CPP) $(CFLAGS) -o timedlistsample timedlistsample.cc $(LDFLAGS) 
 
-timedqueuesample: timedqueuesample.cc $(LIBPATH)libpards.h $(LIBPATH)Sync.h $(LIBPATH)SyncList.h $(LIBPATH)SyncQueue.h
-	$(CPP) $(CFLAGS) -o timedqueuesample timedqueuesample.cc $(INCFLAGS) $(LDFLAGS) 
+timedqueuesample: timedqueuesample.cc
+	$(CPP) $(CFLAGS) -o timedqueuesample timedqueuesample.cc $(LDFLAGS) 
 
-mergersample: mergersample.cc $(LIBPATH)libpards.h $(LIBPATH)Sync.h $(LIBPATH)SyncList.h $(LIBPATH)SyncQueue.h $(LIBPATH)Merger.h
-	$(CPP) $(CFLAGS) -o mergersample mergersample.cc $(INCFLAGS) $(LDFLAGS) 
-mergersample2: mergersample2.cc $(LIBPATH)libpards.h $(LIBPATH)Sync.h $(LIBPATH)SyncList.h $(LIBPATH)SyncQueue.h $(LIBPATH)Merger.h
-	$(CPP) $(CFLAGS) -o mergersample2 mergersample2.cc $(INCFLAGS) $(LDFLAGS) 
-intrputsample: intrputsample.cc $(LIBPATH)libpards.h $(LIBPATH)Sync.h $(LIBPATH)SyncList.h $(LIBPATH)SyncQueue.h $(LIBPATH)Merger.h
-	$(CPP) $(CFLAGS) -o intrputsample intrputsample.cc $(INCFLAGS) $(LDFLAGS) 
-timedputsample: timedputsample.cc $(LIBPATH)libpards.h $(LIBPATH)Sync.h $(LIBPATH)SyncList.h $(LIBPATH)SyncQueue.h $(LIBPATH)Merger.h
-	$(CPP) $(CFLAGS) -o timedputsample timedputsample.cc $(INCFLAGS) $(LDFLAGS) 
+mergersample: mergersample.cc
+	$(CPP) $(CFLAGS) -o mergersample mergersample.cc $(LDFLAGS) 
+mergersample2: mergersample2.cc
+	$(CPP) $(CFLAGS) -o mergersample2 mergersample2.cc $(LDFLAGS) 
+intrputsample: intrputsample.cc
+	$(CPP) $(CFLAGS) -o intrputsample intrputsample.cc $(LDFLAGS) 
+timedputsample: timedputsample.cc
+	$(CPP) $(CFLAGS) -o timedputsample timedputsample.cc $(LDFLAGS) 
 
 clean:
 	rm -f *.o *~ sample fib qsort listsample listsample2 queuesample workpoolsample spmdsample timedreadsample timedlistsample timedqueuesample mergersample timedputsample intrputsample intrreadsample intrlistsample intrqueuesample spmdmatmul mergersample2
diff -uNr pards/samples/fib.cc pards-patch/samples/fib.cc
--- pards/samples/fib.cc	2007-02-12 23:03:30.000000000 +0900
+++ pards-patch/samples/fib.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "Sync.h"
+#include <pards/Sync.h>
 
 void sync_fib(int,Sync<int>);
 int fib(int);
diff -uNr pards/samples/intrlistsample.cc pards-patch/samples/intrlistsample.cc
--- pards/samples/intrlistsample.cc	2007-03-18 22:24:23.000000000 +0900
+++ pards-patch/samples/intrlistsample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "SyncList.h"
+#include <pards/SyncList.h>
 
 int main(int argc, char* argv[])
 {
diff -uNr pards/samples/intrputsample.cc pards-patch/samples/intrputsample.cc
--- pards/samples/intrputsample.cc	2007-04-22 01:43:35.000000000 +0900
+++ pards-patch/samples/intrputsample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,5 +1,5 @@
-#include "SyncQueue.h"
-#include "Merger.h"
+#include <pards/SyncQueue.h>
+#include <pards/Merger.h>
 
 class Item{
 public:
diff -uNr pards/samples/intrputsample_err.cc pards-patch/samples/intrputsample_err.cc
--- pards/samples/intrputsample_err.cc	2007-04-22 01:52:04.000000000 +0900
+++ pards-patch/samples/intrputsample_err.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,5 +1,5 @@
-#include "SyncQueue.h"
-#include "Merger.h"
+#include <pards/SyncQueue.h>
+#include <pards/Merger.h>
 
 class Item{
 public:
diff -uNr pards/samples/intrqueuesample.cc pards-patch/samples/intrqueuesample.cc
--- pards/samples/intrqueuesample.cc	2007-03-18 22:24:23.000000000 +0900
+++ pards-patch/samples/intrqueuesample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "SyncQueue.h"
+#include <pards/SyncQueue.h>
 
 int main(int argc, char* argv[])
 {
diff -uNr pards/samples/intrreadsample.cc pards-patch/samples/intrreadsample.cc
--- pards/samples/intrreadsample.cc	2007-03-18 22:24:23.000000000 +0900
+++ pards-patch/samples/intrreadsample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "Sync.h"
+#include <pards/Sync.h>
 
 int main(int argc, char* argv[])
 {
diff -uNr pards/samples/listsample.cc pards-patch/samples/listsample.cc
--- pards/samples/listsample.cc	2006-11-26 15:35:52.000000000 +0900
+++ pards-patch/samples/listsample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "SyncList.h"
+#include <pards/SyncList.h>
 
 int main()
 {
diff -uNr pards/samples/listsample2.cc pards-patch/samples/listsample2.cc
--- pards/samples/listsample2.cc	2006-12-31 14:59:59.000000000 +0900
+++ pards-patch/samples/listsample2.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "SyncList.h"
+#include <pards/SyncList.h>
 
 int main()
 {
diff -uNr pards/samples/mergersample.cc pards-patch/samples/mergersample.cc
--- pards/samples/mergersample.cc	2007-04-22 01:44:37.000000000 +0900
+++ pards-patch/samples/mergersample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,5 +1,5 @@
-#include "SyncQueue.h"
-#include "Merger.h"
+#include <pards/SyncQueue.h>
+#include <pards/Merger.h>
 
 class Item{
 public:
diff -uNr pards/samples/mergersample2.cc pards-patch/samples/mergersample2.cc
--- pards/samples/mergersample2.cc	2007-02-12 22:53:37.000000000 +0900
+++ pards-patch/samples/mergersample2.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,5 +1,5 @@
-#include "SyncQueue.h"
-#include "Merger.h"
+#include <pards/SyncQueue.h>
+#include <pards/Merger.h>
 
 class Item{
 public:
diff -uNr pards/samples/qsort.cc pards-patch/samples/qsort.cc
--- pards/samples/qsort.cc	2006-11-26 15:35:52.000000000 +0900
+++ pards-patch/samples/qsort.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
-#include "Sync.h"
+#include <pards/Sync.h>
 
 #define MIN_SIZE 1000
 
diff -uNr pards/samples/qu.cc pards-patch/samples/qu.cc
--- pards/samples/qu.cc	2007-08-25 21:16:39.000000000 +0900
+++ pards-patch/samples/qu.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "Sync.h"
+#include <pards/Sync.h>
 
 #define MAX_SIZE 13
 
diff -uNr pards/samples/queuesample.cc pards-patch/samples/queuesample.cc
--- pards/samples/queuesample.cc	2006-12-31 14:59:59.000000000 +0900
+++ pards-patch/samples/queuesample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "SyncQueue.h"
+#include <pards/SyncQueue.h>
 
 int main()
 {
diff -uNr pards/samples/sample.cc pards-patch/samples/sample.cc
--- pards/samples/sample.cc	2006-11-26 15:35:52.000000000 +0900
+++ pards-patch/samples/sample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "Sync.h"
+#include <pards/Sync.h>
 
 int main()
 {
diff -uNr pards/samples/spmdmatmul.cc pards-patch/samples/spmdmatmul.cc
--- pards/samples/spmdmatmul.cc	2007-02-26 01:26:54.000000000 +0900
+++ pards-patch/samples/spmdmatmul.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "parblock.h"
+#include <pards/parblock.h>
 
 //#define DEBUG
 
diff -uNr pards/samples/spmdsample.cc pards-patch/samples/spmdsample.cc
--- pards/samples/spmdsample.cc	2007-01-07 17:26:59.000000000 +0900
+++ pards-patch/samples/spmdsample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "parblock.h"
+#include <pards/parblock.h>
 
 #define NP 3
 
diff -uNr pards/samples/timedlistsample.cc pards-patch/samples/timedlistsample.cc
--- pards/samples/timedlistsample.cc	2007-03-18 22:24:23.000000000 +0900
+++ pards-patch/samples/timedlistsample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "SyncList.h"
+#include <pards/SyncList.h>
 
 int main(int argc, char* argv[])
 {
diff -uNr pards/samples/timedputsample.cc pards-patch/samples/timedputsample.cc
--- pards/samples/timedputsample.cc	2007-04-22 01:42:54.000000000 +0900
+++ pards-patch/samples/timedputsample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,5 +1,5 @@
-#include "SyncQueue.h"
-#include "Merger.h"
+#include <pards/SyncQueue.h>
+#include <pards/Merger.h>
 
 class Item{
 public:
diff -uNr pards/samples/timedqueuesample.cc pards-patch/samples/timedqueuesample.cc
--- pards/samples/timedqueuesample.cc	2007-03-18 22:24:23.000000000 +0900
+++ pards-patch/samples/timedqueuesample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "SyncQueue.h"
+#include <pards/SyncQueue.h>
 
 int main(int argc, char* argv[])
 {
diff -uNr pards/samples/timedreadsample.cc pards-patch/samples/timedreadsample.cc
--- pards/samples/timedreadsample.cc	2007-03-18 22:24:23.000000000 +0900
+++ pards-patch/samples/timedreadsample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,4 +1,4 @@
-#include "Sync.h"
+#include <pards/Sync.h>
 
 int main(int argc, char* argv[])
 {
diff -uNr pards/samples/workpoolsample.cc pards-patch/samples/workpoolsample.cc
--- pards/samples/workpoolsample.cc	2007-02-12 23:05:31.000000000 +0900
+++ pards-patch/samples/workpoolsample.cc	2008-01-07 03:08:57.000000000 +0900
@@ -1,5 +1,5 @@
-#include "SyncQueue.h"
-#include "WorkPool.h"
+#include <pards/SyncQueue.h>
+#include <pards/WorkPool.h>
 
 int main()
 {
diff -uNr pards/src/Makefile pards-patch/src/Makefile
--- pards/src/Makefile	2007-01-07 17:26:27.000000000 +0900
+++ pards-patch/src/Makefile	2008-01-07 03:08:57.000000000 +0900
@@ -1,20 +1,49 @@
+SHELL = /bin/sh
+
 CPP=g++
 AR=ar
 RANLIB=ranlib
+INSTALL=install -p
+INSTALL_DATA=${INSTALL} -m0644
 CFLAGS=-O2 -g -Wall
+DESTDIR=
+prefix=${DESTDIR}/usr
+_LIB=lib
+_LIBDIR=${prefix}/${_LIB}
+_INCLUDEDIR=${prefix}/include
+MAJOR_VER=0
+MINOR_VER=4
+PARDS_VER=${MAJOR_VER}.${MINOR_VER}
 
-all: libpards.a 
+all: libpards.so libpards.a
 
 libpards.a: libpards.o parblock.o
 	rm -f libpards.a
 	$(AR) cq libpards.a libpards.o parblock.o
 	$(RANLIB) libpards.a
+libpards.so: libpards-PIC.o parblock-PIC.o
+	rm -f libpards.so.*
+	gcc -shared -Wl,-soname,libpards.so.${MAJOR_VER} \
+		-o libpards.so.${PARDS_VER} \
+		libpards-PIC.o parblock-PIC.o -lstdc++
 
 libpards.o: libpards.cc libpards.h
 	$(CPP) $(CFLAGS) -c libpards.cc
+libpards-PIC.o: libpards.cc libpards.h     
+	$(CPP) $(CFLAGS) -fPIC -c libpards.cc -o libpards-PIC.o
 
 parblock.o: parblock.cc libpards.h parblock.h
 	$(CPP) $(CFLAGS) -c parblock.cc
-
+parblock-PIC.o: parblock.cc libpards.h parblock.h
+	$(CPP) $(CFLAGS) -fPIC -c parblock.cc -o parblock-PIC.o   
 clean:
-	rm -f *.o *~ libpards.a
+	rm -f *.o *~ libpards.a libpards.so.*
+
+install: all
+	if ( test ! -d ${_LIBDIR} ); then ${INSTALL} -d ${_LIBDIR};fi
+	${INSTALL} libpards.so.${PARDS_VER} ${_LIBDIR}
+	ln -s libpards.so.${PARDS_VER} ${_LIBDIR}/libpards.so.${MAJOR_VER}
+	ln -s libpards.so.${PARDS_VER} ${_LIBDIR}/libpards.so
+	${INSTALL_DATA} libpards.a ${_LIBDIR}
+	mkdir -p ${_INCLUDEDIR}/pards
+	${INSTALL_DATA} *.h ${_INCLUDEDIR}/pards


--- NEW FILE pards.spec ---
%define repoid 28257
       
Summary: A library for PARallel programs with Dataflow Synchronization
Name: pards
Version: 0.4
Release: 5%{?dist}
URL: http://pards.sourceforge.jp/
Source0: http://downloads.sourceforge.jp/%{name}/%{repoid}/%{name}04.tar.gz
Patch0: %{name}-%{version}.patch
License: BSD
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

%package devel
Summary: A library for PARallel programs with Dataflow Synchronization
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
#Provides: %{name}-static = %{version}-%{release}

%description
This is a library for writing parallel programs (for UNIX OSes).
With this library, you can write parallel programs more easily than 
using other libraries like pthread directly. As a practical example, 
bzip2 is parallelized using this library.

%description devel
This package contains static libraries documents and header files needed 
to develop programs which make use of pards library.

%prep
%setup -q -n %{name} 
%patch -p1
iconv -f eucjp -t utf8 README.ja >README.ja.utf
mv README.ja.utf README.ja

%build
pushd src
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
popd

%install
rm -rf %{buildroot}
pushd src
make DESTDIR=%{buildroot} _LIB=%{_lib} install
popd
rm %{buildroot}/%{_libdir}/*.a

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.so.*
%doc ChangeLog README README.ja LICENSE

%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/pards
%{_includedir}/pards/*
%{_libdir}/lib%{name}.so
#%{_libdir}/lib%{name}.a
%doc doc/ misc/ samples/ gtk/
#%doc bzip2-1.0.3/

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%changelog
* Mon Jan  7 2008 Masahiro Hasegawa <masahase at gmail.com> - 0.4-5
- remove static library
* Thu Dec 27 2007 Masahiro Hasegawa <masahase at gmail.com> - 0.4-4
- fix spec
* Wed Dec 26 2007 Masahiro Hasegawa <masahase at gmail.com> - 0.4-3
- fix spec
* Wed Dec 26 2007 Masahiro Hasegawa <masahase at gmail.com> - 0.4-2
- fix spec
* Tue Dec 25 2007 Masahiro Hasegawa <masahase at gmail.com> - 0.4-1
- Initial build for Version 0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pards/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2008 18:05:29 -0000	1.1
+++ .cvsignore	14 Jan 2008 00:35:42 -0000	1.2
@@ -0,0 +1 @@
+pards04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pards/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2008 18:05:29 -0000	1.1
+++ sources	14 Jan 2008 00:35:42 -0000	1.2
@@ -0,0 +1 @@
+fedd94d7fd682d48a95ab0f91bf39a4a  pards04.tar.gz




More information about the fedora-extras-commits mailing list