From: Gábor Gombás <[email protected]>
We must use the libtool command to link against uninstalled libtool
libraries. Without this change the next patch will not build.
---
samples/example_app/Makefile | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/samples/example_app/Makefile b/samples/example_app/Makefile
index a083d47..2efc72f 100644
--- a/samples/example_app/Makefile
+++ b/samples/example_app/Makefile
@@ -3,13 +3,14 @@
BOINC_DIR = ../..
BOINC_API_DIR = $(BOINC_DIR)/api
BOINC_LIB_DIR = $(BOINC_DIR)/lib
+LIBTOOL=$(BOINC_DIR)/libtool
CXXFLAGS = -g \
-DAPP_GRAPHICS \
-I$(BOINC_DIR) \
-I$(BOINC_LIB_DIR) \
-I$(BOINC_API_DIR) \
- -L /usr/X11R6/lib \
+ -L/usr/X11R6/lib \
-L.
# the following should be freeglut; use nm to check
@@ -45,15 +46,15 @@ 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: uc2.o libstdc++.a $(BOINC_API_DIR)/libboinc_api.la
$(BOINC_LIB_DIR)/libboinc.la
+ $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) -o uc2 uc2.o libstdc++.a
-pthread \
+ $(BOINC_API_DIR)/libboinc_api.la \
+ $(BOINC_LIB_DIR)/libboinc.la
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 \
+ $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) -o uc2_graphics
uc2_graphics.o libstdc++.a -pthread \
+ $(BOINC_API_DIR)/libboinc_graphics2.la \
+ $(BOINC_API_DIR)/libboinc_api.la \
+ $(BOINC_LIB_DIR)/libboinc.la \
$(LIBGLUT) $(LIBGLU) $(LIBJPEG) \
-lGL -lX11 -lXmu -lm
--
1.6.4.3
_______________________________________________
boinc_dev mailing list
[email protected]
http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev
To unsubscribe, visit the above URL and
(near bottom of page) enter your email address.
