[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-296-gdc96a5e

Steffen Moeller moeller at debian.org
Sun Jul 24 22:59:52 UTC 2011


The following commit has been merged in the master branch:
commit 35c557bd6d7ac49f34ea85c0b0d51ad7696e8c27
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jul 24 22:41:02 2011 +0200

    No more Makefiles.

diff --git a/samples/atiopencl/Makefile b/samples/atiopencl/Makefile
deleted file mode 100644
index be9438a..0000000
--- a/samples/atiopencl/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# makefile for atiopencl BOINC example appication on Linux.
-
-BOINC_DIR = ../..
-BOINC_API_DIR = $(BOINC_DIR)/api
-BOINC_LIB_DIR = $(BOINC_DIR)/lib 
-
-CXXFLAGS = -g \
-    -I$(BOINC_DIR) \
-    -I$(BOINC_LIB_DIR) \
-    -I$(BOINC_API_DIR) \
-    -I ../../../ati-stream-sdk-v2.1-lnx32/include \
-    -lpthread \
-    -L.
-
-PROGS = atiopencl \
-
-all: $(PROGS)
-
-libstdc++.a:
-	ln -s `g++ -print-file-name=libstdc++.a`
-
-clean:
-	/bin/rm -f $(PROGS) *.o libstdc++.a
-
-distclean:
-	/bin/rm -f $(PROGS) *.o libstdc++.a
-
-install: atiopencl
-
-atiopencl: atiopencl.o libstdc++.a
-	$(CXX) $(CXXFLAGS) -o atiopencl atiopencl.o libstdc++.a \
-        -lOpenCL -L../../../ati-stream-sdk-v2.1-lnx32/lib/x86 \
-        -lboinc_api -L$(BOINC_API_DIR) \
-        -lboinc -L$(BOINC_LIB_DIR)
-
-atiopencl.o: atiopencl.cpp atiopencl.hpp
-	$(CXX) $(CXXFLAGS) -c atiopencl.cpp
diff --git a/samples/example_app/Makefile b/samples/example_app/Makefile
deleted file mode 100644
index 7c16134..0000000
--- a/samples/example_app/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# This should work on Linux.  Modify as needed for other platforms.
-
-BOINC_DIR = ../..
-BOINC_API_DIR = $(BOINC_DIR)/api
-BOINC_LIB_DIR = $(BOINC_DIR)/lib
-
-CXXFLAGS = -g \
-	-Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \
-    -DAPP_GRAPHICS \
-    -I$(BOINC_DIR) \
-    -I$(BOINC_LIB_DIR) \
-    -I$(BOINC_API_DIR) \
-    -L /usr/X11R6/lib \
-    -L.
-
-# the following should be freeglut; use nm to check
-# you may have to change the paths for your system
-
-ifeq ($(wildcard /usr/local/lib/libglut.a),)
-	LIBGLUT = /usr/lib/libglut.a
-	LIBGLU = /usr/lib/libGLU.a
-	LIBJPEG = /usr/lib/libjpeg.a
-else
-	LIBGLUT = /usr/local/lib/libglut.a
-	LIBGLU = /usr/local/lib/libGLU.a
-	LIBJPEG = /usr/local/lib/libjpeg.a
-endif
-
-PROGS = uc2 \
-# uc2_graphics
-# make this optional so compile doesn't break on systems without OpenGL
-
-all: $(PROGS)
-
-libstdc++.a:
-	ln -s `g++ -print-file-name=libstdc++.a`
-
-clean:
-	/bin/rm -f $(PROGS) *.o libstdc++.a
-
-distclean:
-	/bin/rm -f $(PROGS) *.o libstdc++.a
-
-install: uc2
-
-# specify library paths explicitly (rather than -l)
-# because otherwise you might get a version in /usr/lib etc.
-
-uc2: uc2.o libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
-	$(CXX) $(CXXFLAGS) -o uc2 uc2.o libstdc++.a -pthread \
-	$(BOINC_API_DIR)/libboinc_api.a \
-	$(BOINC_LIB_DIR)/libboinc.a
-
-uc2_graphics: uc2_graphics.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_graphics2.a
-	$(CXX) $(CXXFLAGS) -o uc2_graphics uc2_graphics.o libstdc++.a -pthread \
-	$(BOINC_API_DIR)/libboinc_graphics2.a \
-	$(BOINC_API_DIR)/libboinc_api.a \
-	$(BOINC_LIB_DIR)/libboinc.a \
-    $(LIBGLUT) $(LIBGLU) $(LIBJPEG) \
-    -lGL -lX11 -lXmu -lm
diff --git a/samples/multi_thread/Makefile b/samples/multi_thread/Makefile
deleted file mode 100644
index 48f9b10..0000000
--- a/samples/multi_thread/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# This should work on Linux.  Modify as needed for other platforms.
-
-BOINC_DIR = ../..
-BOINC_API_DIR = $(BOINC_DIR)/api
-BOINC_LIB_DIR = $(BOINC_DIR)/lib
-
-CXXFLAGS = -g \
-    -I$(BOINC_DIR) \
-    -I$(BOINC_LIB_DIR) \
-    -I$(BOINC_API_DIR) \
-    -L$(BOINC_API_DIR) \
-    -L$(BOINC_LIB_DIR) \
-    -L.
-
-PROGS = multi_thread
-
-all: $(PROGS)
-
-libstdc++.a:
-	ln -s `g++ -print-file-name=libstdc++.a`
-
-clean:
-	/bin/rm -f $(PROGS)
-
-distclean:
-	/bin/rm -f $(PROGS) *.o libstdc++.a
-
-multi_thread: multi_thread.o libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
-	$(CXX) $(CXXFLAGS) -o multi_thread multi_thread.o libstdc++.a -pthread -lboinc_api -lboinc
diff --git a/samples/nvcuda/Makefile b/samples/nvcuda/Makefile
deleted file mode 100644
index aadf9db..0000000
--- a/samples/nvcuda/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# makefile for cuda BOINC example application on Linux.
-
-# Add source files here
-EXECUTABLE	:= example_app_nvcuda
-# Cuda source files (compiled with cudacc)
-CUFILES		:= cuda_kernel.cu
-# C/C++ source files (compiled with gcc / c++)
-CCFILES		:= cuda.cpp\
-
-################################################################################
-# Rules and targets
-
-include common.mk
diff --git a/samples/nvopencl/Makefile b/samples/nvopencl/Makefile
deleted file mode 100644
index 64fa59a..0000000
--- a/samples/nvopencl/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# makefile for nvopencl BOINC example application on Linux.
-
-# Add source files here
-EXECUTABLE	:= example_app_nvopencl
-# C/C++ source files (compiled with gcc / c++)
-CCFILES		:= nvopencl.cpp
-
-################################################################################
-# Rules and targets
-
-include common_opencl.mk
-
-
diff --git a/samples/sleeper/Makefile b/samples/sleeper/Makefile
deleted file mode 100644
index 13492ec..0000000
--- a/samples/sleeper/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# This should work on Linux.  Modify as needed for other platforms.
-
-BOINC_DIR = ../..
-BOINC_API_DIR = $(BOINC_DIR)/api
-BOINC_LIB_DIR = $(BOINC_DIR)/lib
-
-CXXFLAGS = -g \
-    -I$(BOINC_DIR) \
-    -I$(BOINC_LIB_DIR) \
-    -I$(BOINC_API_DIR) \
-    -L$(BOINC_API_DIR) \
-    -L$(BOINC_LIB_DIR) \
-    -L.
-
-PROGS = sleeper
-
-all: $(PROGS)
-
-libstdc++.a:
-	ln -s `g++ -print-file-name=libstdc++.a`
-
-clean:
-	rm $(PROGS)
-
-distclean:
-	/bin/rm -f $(PROGS) *.o libstdc++.a
-
-sleeper: sleeper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
-	g++ $(CXXFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
diff --git a/samples/vboxwrapper/Makefile b/samples/vboxwrapper/Makefile
deleted file mode 100644
index e0b533b..0000000
--- a/samples/vboxwrapper/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# This should work on Linux.  Modify as needed for other platforms.
-
-# Change the following to match your installation
-BOINC_DIR = ../..
-BOINC_API_DIR = $(BOINC_DIR)/api
-BOINC_LIB_DIR = $(BOINC_DIR)/lib
-
-CXXFLAGS = -g \
-	-Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \
-    -I$(BOINC_DIR) \
-    -I$(BOINC_LIB_DIR) \
-    -I$(BOINC_API_DIR) \
-    -L$(BOINC_API_DIR) \
-    -L$(BOINC_LIB_DIR) \
-    -L.
-
-PROGS = vboxwrapper
-
-all: $(PROGS)
-
-libstdc++.a:
-	ln -s `g++ -print-file-name=libstdc++.a`
-
-clean:
-	rm $(PROGS) *.o
-
-distclean:
-	/bin/rm -f $(PROGS) *.o libstdc++.a
-
-vbox.o: vbox.cpp
-	g++ $(CXXFLAGS) -c vbox.cpp
-vm.o: vm.cpp
-	g++ $(CXXFLAGS) -c vm.cpp
-
-vboxwrapper: vboxwrapper.o vbox.o vm.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
-	g++ $(CXXFLAGS) -o vboxwrapper vboxwrapper.o vbox.o vm.o libstdc++.a -pthread -lboinc_api -lboinc
diff --git a/samples/worker/Makefile b/samples/worker/Makefile
deleted file mode 100644
index 4abe4d9..0000000
--- a/samples/worker/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-CXXFLAGS = -g 
-
-PROGS = worker
-
-all: $(PROGS)
-
-clean:
-	rm $(PROGS)
-
-distclean:
-	rm $(PROGS)
-
-worker: worker.o
-	g++ $(CXXFLAGS) -o worker worker.o
diff --git a/samples/wrapper/Makefile b/samples/wrapper/Makefile
deleted file mode 100644
index 0180006..0000000
--- a/samples/wrapper/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# This should work on Linux.  Modify as needed for other platforms.
-
-# Change the following to match your installation
-BOINC_DIR = ../..
-BOINC_API_DIR = $(BOINC_DIR)/api
-BOINC_LIB_DIR = $(BOINC_DIR)/lib
-
-CXXFLAGS = -g \
-	-Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \
-    -I$(BOINC_DIR) \
-    -I$(BOINC_LIB_DIR) \
-    -I$(BOINC_API_DIR) \
-    -L$(BOINC_API_DIR) \
-    -L$(BOINC_LIB_DIR) \
-    -L.
-
-PROGS = wrapper
-
-all: $(PROGS)
-
-libstdc++.a:
-	ln -s `g++ -print-file-name=libstdc++.a`
-
-clean:
-	rm $(PROGS) *.o
-
-distclean:
-	/bin/rm -f $(PROGS) *.o libstdc++.a
-
-wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
-	g++ $(CXXFLAGS) -o wrapper wrapper.o libstdc++.a -pthread -lboinc_api -lboinc
diff --git a/samples/wrappture/Makefile b/samples/wrappture/Makefile
deleted file mode 100644
index 204d119..0000000
--- a/samples/wrappture/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# This should work on Linux.  Modify as needed for other platforms.
-
-# Change the following to match your installation
-BOINC_DIR = ../..
-BOINC_API_DIR = $(BOINC_DIR)/api
-BOINC_LIB_DIR = $(BOINC_DIR)/lib
-RAPPTURE_DIR = /home/boincadm/rappture/rappture/src/core
-
-CXXFLAGS = -g \
-    -I$(BOINC_DIR) \
-    -I$(BOINC_LIB_DIR) \
-    -I$(BOINC_API_DIR) \
-    -I$(RAPPTURE_DIR) \
-    -L$(BOINC_API_DIR) \
-    -L$(BOINC_LIB_DIR) \
-    -L$(RAPPTURE_DIR) \
-    -L.
-
-PROGS = wrappture_example fermi
-
-all: $(PROGS)
-
-libstdc++.a:
-	ln -s `g++ -print-file-name=libstdc++.a`
-
-clean:
-	rm $(PROGS) *.o
-
-distclean:
-	/bin/rm -f $(PROGS) *.o libstdc++.a
-
-wrappture.o: wrappture.cpp
-	g++ $(CXXFLAGS) -c -o wrappture.o wrappture.cpp
-
-wrappture_example: wrappture.o wrappture_example.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(RAPPTURE_DIR)/librappture.a
-	g++ $(CXXFLAGS) -o wrappture_example wrappture_example.o wrappture.o $(RAPPTURE_DIR)/librappture.a libstdc++.a -pthread -lboinc_api -lboinc -lexpat -lz
-
-fermi: fermi.cpp
-	g++ $(CSSFLAGS) -o fermi fermi.cpp

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list