From: Gábor Gombás <[email protected]>
This should be tested by someone who has access to OS/2, but libtool
already knows that the "lib" prefix should be omitted there.
---
api/Makefile.am | 29 -----------------------------
lib/Makefile.am | 34 ----------------------------------
sched/Makefile.am | 29 -----------------------------
3 files changed, 0 insertions(+), 92 deletions(-)
diff --git a/api/Makefile.am b/api/Makefile.am
index 49a0db4..813f286 100644
--- a/api/Makefile.am
+++ b/api/Makefile.am
@@ -53,35 +53,6 @@ pkginclude_HEADERS = \
gutil.h
endif ## INSTALL_HEADERS
-# Some OSs may not prefix libraries with lib.
-# For example OS2
-if OS_OS2
-LIBBOINC_API_STATIC=boinc_api.${LIBEXT}
-LIBBOINC_GRAPHICS2_STATIC=boinc_graphics2.${LIBEXT}
-else
-LIBBOINC_API_STATIC=libboinc_api.${LIBEXT}
-LIBBOINC_GRAPHICS2_STATIC=libboinc_graphics2.${LIBEXT}
-endif
-
-
-if BUILD_STATIC_LIBS
-all_local = $(LIBBOINC_API_STATIC)
-if BUILD_GRAPHICS_API
-all_local += $(LIBBOINC_GRAPHICS2_STATIC)
-endif
-endif
-
-all-local: $(all_local)
-
-$(LIBBOINC_API_STATIC): libboinc_api.la
- rm -f $(LIBBOINC_API_STATIC)
- $(LN) .libs/$(LIBBOINC_API_STATIC) .
-
-$(LIBBOINC_GRAPHICS2_STATIC): libboinc_graphics2.la
- rm -f $(LIBBOINC_GRAPHICS2_STATIC)
- $(LN) .libs/$(LIBBOINC_GRAPHICS2_STATIC) .
-
-
endif ## ENABLE_LIBRARIES
.PHONY:
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 293157c..41a0f60 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -159,40 +159,6 @@ libboinc_crypt_fcgi_la_LIBADD = libboinc_fcgi.la
$(SSL_LIBS)
endif
# end of "if ENABLE_FCGI"
-# Some OSs may not prefix libraries with lib.
-# For example OS2
-if OS_OS2
-LIBBOINC_STATIC=boinc.${LIBEXT}
-LIBBOINC_CRYPT_STATIC=boinc_crypt.${LIBEXT}
-LIBBOINC_FCGI_STATIC=boinc_fcgi.${LIBEXT}
-else
-LIBBOINC_STATIC=libboinc.${LIBEXT}
-LIBBOINC_CRYPT_STATIC=libboinc_crypt.${LIBEXT}
-LIBBOINC_FCGI_STATIC=libboinc_fcgi.${LIBEXT}
-endif
-
-
-if BUILD_STATIC_LIBS
-all_local = $(LIBBOINC_STATIC) $(LIBBOINC_CRTYPT_STATIC)
-if ENABLE_FCGI
-all_local += $(LIBBOINC_FCGI_STATIC)
-endif
-endif
-
-all-local: $(all_local)
-
-$(LIBBOINC_STATIC): libboinc.la
- rm -f $(LIBBOINC_STATIC)
- $(LN) .libs/$(LIBBOINC_STATIC) .
-
-$(LIBBOINC_CRYPT_STATIC): libboinc_crypt.la
- rm -f $(LIBBOINC_CRYPT_STATIC)
- $(LN) .libs/$(LIBBOINC_CRYPT_STATIC)
-
-$(LIBBOINC_FCGI_STATIC): libboinc_fcgi.la
- rm -f $(LIBBOINC_FCGI_STATIC)
- $(LN) .libs/$(LIBBOINC_FCGI_STATIC) .
-
endif
# end of "if ENABLE_LIBRARIES"
diff --git a/sched/Makefile.am b/sched/Makefile.am
index 328ec58..6b8bcf4 100644
--- a/sched/Makefile.am
+++ b/sched/Makefile.am
@@ -51,35 +51,6 @@ libsched_fcgi_la_LIBADD = ../lib/libboinc_crypt_fcgi.la
../lib/libboinc_fcgi.la
endif
# end of "if ENABLE_FCGI"
-# Some OSs may not prefix libraries with lib.
-# For example OS2
-if OS_OS2
-LIBSCHED_STATIC=sched.${LIBEXT}
-LIBSCHED_FCGI_STATIC=sched_fcgi.${LIBEXT}
-else
-LIBSCHED_STATIC=libsched.${LIBEXT}
-LIBSCHED_FCGI_STATIC=libsched_fcgi.${LIBEXT}
-endif
-
-
-if BUILD_STATIC_LIBS
-all_local = $(LIBSCHED_STATIC)
-if ENABLE_FCGI
-all_local += $(LIBSCHED_FCGI_STATIC)
-endif
-endif
-
-all-local: $(all_local)
-
-$(LIBSCHED_STATIC): libsched.la
- rm -f $(LIBSCHED_STATIC)
- $(LN) .libs/$(LIBSCHED_STATIC)
-
-$(LIBSCHED_FCGI_STATIC): libsched_fcgi.la
- rm -f $(LIBSCHED_FCGI_STATIC)
- $(LN) .libs/$(LIBSCHED_FCGI_STATIC)
-
-
endif
# end of "if ENABLE_LIBRARIES
--
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.
