[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:53 UTC 2011


The following commit has been merged in the master branch:
commit fbeb727f836e90b20061047df9c5cff0d1dc96e4
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jul 25 00:03:20 2011 +0200

    Should not have been removed.
    
    It is the "clean" target's fault.

diff --git a/debian/rules b/debian/rules
index 44453e2..3c55e8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,7 +137,7 @@ CFGFLAGS_boinc-client = \
 
 clean:
 	dh clean
-	find . -name "Makefile" | xargs -r rm
+	find . -name "Makefile" | grep -v samples | xargs -r rm
 	rm -f configure
 
 # Commands not to execute - empty overrides
diff --git a/samples/example_app/Makefile b/samples/example_app/Makefile
new file mode 100644
index 0000000..7c16134
--- /dev/null
+++ b/samples/example_app/Makefile
@@ -0,0 +1,60 @@
+# 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

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list