Author: matkor Date: Thu Aug 14 09:21:07 2008 GMT Module: SOURCES Tag: HEAD ---- Log message: - Another approach to libtool issues.
---- Files affected: SOURCES: glusterfs-link_fix.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/glusterfs-link_fix.patch diff -u SOURCES/glusterfs-link_fix.patch:1.2 SOURCES/glusterfs-link_fix.patch:1.3 --- SOURCES/glusterfs-link_fix.patch:1.2 Wed Aug 13 13:28:14 2008 +++ SOURCES/glusterfs-link_fix.patch Thu Aug 14 11:21:02 2008 @@ -1,358 +1,326 @@ ---- glusterfs-1.3.10/auth/ip/src/Makefile.am.link-fix 2008-08-07 15:55:18.000000000 +0000 -+++ glusterfs-1.3.10/auth/ip/src/Makefile.am 2008-08-07 15:55:27.000000000 +0000 -@@ -18,6 +18,8 @@ auth_PROGRAMS = ip.so - authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth +--- glusterfs-1.3.10/xlators/cluster/unify/src/Makefile.am-fix_link 2008-08-13 20:03:32.000000000 +0200 ++++ glusterfs-1.3.10/xlators/cluster/unify/src/Makefile.am 2008-08-13 20:05:00.000000000 +0200 +@@ -15,12 +15,15 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. - ip_so_SOURCES = ip.c -+ip_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so + +-xlator_PROGRAMS = unify.so ++xlator_LTLIBRARIES = unify.la + - #noinst_HEADERS = alu.h + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ ---- glusterfs-1.3.10/auth/login/src/Makefile.am.link-fix 2008-08-07 15:56:16.000000000 +0000 -+++ glusterfs-1.3.10/auth/login/src/Makefile.am 2008-08-07 15:56:24.000000000 +0000 -@@ -18,6 +18,7 @@ auth_PROGRAMS = login.so - authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth - - login_so_SOURCES = login.c -+login_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so - #noinst_HEADERS = alu.h +-unify_so_SOURCES = unify.c unify-self-heal.c ++unify_la_SOURCES = unify.c unify-self-heal.c + noinst_HEADERS = unify.h - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ ---- glusterfs-1.3.10/xlators/cluster/stripe/src/Makefile.am.link-fix 2008-08-07 13:24:55.000000000 +0000 -+++ glusterfs-1.3.10/xlators/cluster/stripe/src/Makefile.am 2008-08-07 13:25:53.000000000 +0000 -@@ -18,8 +18,10 @@ - xlator_PROGRAMS = stripe.so ++unify_la_LDFLAGS = -module -avoid-version ++ + AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ + -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) + +--- glusterfs-1.3.10/xlators/cluster/afr/src/Makefile.am-fix_link 2008-08-13 20:08:44.000000000 +0200 ++++ glusterfs-1.3.10/xlators/cluster/afr/src/Makefile.am 2008-08-13 20:09:28.000000000 +0200 +@@ -14,12 +14,14 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-xlator_PROGRAMS = afr.so ++xlator_LTLIBRARIES = afr.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster + +-afr_so_SOURCES = afr.c afr_self_heal.c ++afr_la_SOURCES = afr.c afr_self_heal.c + noinst_HEADERS = afr.h + ++afr_la_LDFLAGS = -module -avoid-version ++ + AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ + -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) + +--- glusterfs-1.3.10/xlators/cluster/stripe/src/Makefile.am-fix_link 2008-08-13 20:06:59.000000000 +0200 ++++ glusterfs-1.3.10/xlators/cluster/stripe/src/Makefile.am 2008-08-13 20:07:55.000000000 +0200 +@@ -15,10 +15,13 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + +-xlator_PROGRAMS = stripe.so ++xlator_LTLIBRARIES = stripe.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster +-stripe_so_SOURCES = stripe.c ++stripe_la_SOURCES = stripe.c ++ ++stripe_la_LDFLAGS = -module -avoid-version + - stripe_so_SOURCES = stripe.c #noinst_HEADERS = unify.h -+stripe_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ - -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) ---- glusterfs-1.3.10/xlators/debug/trace/src/Makefile.am.link-fix 2008-08-07 15:01:25.000000000 +0000 -+++ glusterfs-1.3.10/xlators/debug/trace/src/Makefile.am 2008-08-07 15:02:04.000000000 +0000 -@@ -19,6 +19,7 @@ xlator_PROGRAMS = trace.so +--- glusterfs-1.3.10/xlators/debug/trace/src/Makefile.am-fix_link 2008-08-14 10:11:45.000000000 +0200 ++++ glusterfs-1.3.10/xlators/debug/trace/src/Makefile.am 2008-08-14 10:12:33.000000000 +0200 +@@ -15,10 +15,11 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + +-xlator_PROGRAMS = trace.so ++xlator_LTLIBRARIES = trace.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug - trace_so_SOURCES = trace.c -+trace_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so +-trace_so_SOURCES = trace.c ++trace_la_SOURCES = trace.c ++trace_la_LDFLAGS = -module -avoid-version AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) ---- glusterfs-1.3.10/xlators/features/trash/src/Makefile.am.link-fix 2008-08-07 15:14:50.000000000 +0000 -+++ glusterfs-1.3.10/xlators/features/trash/src/Makefile.am 2008-08-07 15:15:00.000000000 +0000 -@@ -18,6 +18,7 @@ xlator_PROGRAMS = trash.so +--- glusterfs-1.3.10/xlators/features/trash/src/Makefile.am-fix_link 2008-08-14 10:24:13.000000000 +0200 ++++ glusterfs-1.3.10/xlators/features/trash/src/Makefile.am 2008-08-14 10:24:59.000000000 +0200 +@@ -14,10 +14,11 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-xlator_PROGRAMS = trash.so ++xlator_LTLIBRARIES = trash.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - trash_so_SOURCES = trash.c -+trash_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so +-trash_so_SOURCES = trash.c ++trash_la_SOURCES = trash.c ++trash_la_LDFLAGS = -module -avoid-version AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) ---- glusterfs-1.3.10/xlators/features/filter/src/Makefile.am.link-fix 2008-08-07 15:08:55.000000000 +0000 -+++ glusterfs-1.3.10/xlators/features/filter/src/Makefile.am 2008-08-07 15:09:08.000000000 +0000 -@@ -18,6 +18,8 @@ xlator_PROGRAMS = filter.so +--- glusterfs-1.3.10/xlators/features/filter/src/Makefile.am-fix_link 2008-08-14 10:13:46.000000000 +0200 ++++ glusterfs-1.3.10/xlators/features/filter/src/Makefile.am 2008-08-14 10:14:21.000000000 +0200 +@@ -14,10 +14,12 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-xlator_PROGRAMS = filter.so ++xlator_LTLIBRARIES = filter.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - filter_so_SOURCES = filter.c -+filter_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so +-filter_so_SOURCES = filter.c ++filter_la_SOURCES = filter.c ++filter_la_LDFLAGS = -module -avoid-version + noinst_HEADERS = filter.h AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ ---- glusterfs-1.3.10/xlators/features/fixed-id/src/Makefile.am.link-fix 2008-08-07 15:11:53.000000000 +0000 -+++ glusterfs-1.3.10/xlators/features/fixed-id/src/Makefile.am 2008-08-07 15:12:25.000000000 +0000 -@@ -18,6 +18,7 @@ xlator_PROGRAMS = fixed-id.so +--- glusterfs-1.3.10/xlators/features/fixed-id/src/Makefile.am-fix_link 2008-08-14 10:15:04.000000000 +0200 ++++ glusterfs-1.3.10/xlators/features/fixed-id/src/Makefile.am 2008-08-14 10:21:35.000000000 +0200 +@@ -14,10 +14,11 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-xlator_PROGRAMS = fixed-id.so ++xlator_LTLIBRARIES = fixed-id.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - fixed_id_so_SOURCES = fixed-id.c -+fixed_id_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so +-fixed_id_so_SOURCES = fixed-id.c ++fixed_id_la_SOURCES = fixed-id.c ++fixed_id_la_LDFLAGS = -module -avoid-version AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) ---- glusterfs-1.3.10/xlators/features/posix-locks/src/Makefile.am.link-fix 2008-08-07 15:13:48.000000000 +0000 -+++ glusterfs-1.3.10/xlators/features/posix-locks/src/Makefile.am 2008-08-07 15:14:01.000000000 +0000 -@@ -18,6 +18,8 @@ xlator_PROGRAMS = posix-locks.so +--- glusterfs-1.3.10/xlators/features/posix-locks/src/Makefile.am-fix_link 2008-08-14 10:22:30.000000000 +0200 ++++ glusterfs-1.3.10/xlators/features/posix-locks/src/Makefile.am 2008-08-14 10:23:02.000000000 +0200 +@@ -14,10 +14,12 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-xlator_PROGRAMS = posix-locks.so ++xlator_LTLIBRARIES = posix-locks.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - posix_locks_so_SOURCES = posix-locks.c -+posix_locks_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so +-posix_locks_so_SOURCES = posix-locks.c ++posix_locks_la_SOURCES = posix-locks.c ++posix_locks_la_LDFLAGS = -module -avoid-version + noinst_HEADERS = posix-locks.h AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ ---- glusterfs-1.3.10/xlators/mount/fuse/src/Makefile.am.link-fix 2008-08-07 15:27:59.000000000 +0000 -+++ glusterfs-1.3.10/xlators/mount/fuse/src/Makefile.am 2008-08-07 15:34:15.000000000 +0000 -@@ -20,12 +20,14 @@ noinst_HEADERS = fuse-extra.h - xlator_PROGRAMS = fuse.so +--- glusterfs-1.3.10/xlators/mount/fuse/src/Makefile.am-fix_link 2008-08-14 10:27:51.000000000 +0200 ++++ glusterfs-1.3.10/xlators/mount/fuse/src/Makefile.am 2008-08-14 10:36:43.000000000 +0200 +@@ -17,15 +17,18 @@ + + noinst_HEADERS = fuse-extra.h + +-xlator_PROGRAMS = fuse.so ++xlator_LTLIBRARIES = fuse.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mount - fuse_so_SOURCES = fuse-bridge.c fuse-extra.c -+ - fuse_so_CFLAGS = -DFUSE_USE_VERSION=26 -fPIC -Wall -pthread \ - $(GF_DARWIN_BUNDLE_CFLAGS) -I$(top_srcdir)/libglusterfs/src \ - -D$(GF_HOST_OS) -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE \ - -DDATADIR=\"$(localstatedir)\" -DCONFDIR=\"$(sysconfdir)/glusterfs\" - fuse_so_LDFLAGS = -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) +-fuse_so_SOURCES = fuse-bridge.c fuse-extra.c +-fuse_so_CFLAGS = -DFUSE_USE_VERSION=26 -fPIC -Wall -pthread \ +- $(GF_DARWIN_BUNDLE_CFLAGS) -I$(top_srcdir)/libglusterfs/src \ +- -D$(GF_HOST_OS) -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE \ +- -DDATADIR=\"$(localstatedir)\" -DCONFDIR=\"$(sysconfdir)/glusterfs\" +-fuse_so_LDFLAGS = -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) -fuse_so_LDADD = -lfuse $(GF_DARWIN_FUSE_LDADD) -+fuse_so_LDADD = -lfuse $(GF_DARWIN_FUSE_LDADD) \ -+ $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so ++fuse_la_SOURCES = fuse-bridge.c fuse-extra.c ++ ++#fuse_la_CFLAGS = -DFUSE_USE_VERSION=26 -fPIC -Wall -pthread \ ++# $(GF_DARWIN_BUNDLE_CFLAGS) -I$(top_srcdir)/libglusterfs/src \ ++# -D$(GF_HOST_OS) -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE \ ++# -DDATADIR=\"$(localstatedir)\" -DCONFDIR=\"$(sysconfdir)/glusterfs\" ++ ++fuse_la_LDFLAGS = -module -avoid-version ++ ++# fuse_la_LIBADD = -lfuse $(GF_DARWIN_FUSE_LDADD) CLEANFILES = *~ ---- glusterfs-1.3.10/xlators/protocol/server/src/Makefile.am.link-fix 2008-08-07 13:58:00.000000000 +0000 -+++ glusterfs-1.3.10/xlators/protocol/server/src/Makefile.am 2008-08-07 13:58:25.000000000 +0000 -@@ -19,6 +19,8 @@ xlator_PROGRAMS = server.so +--- glusterfs-1.3.10/xlators/protocol/client/src/Makefile.am-fix_link 2008-08-13 20:17:53.000000000 +0200 ++++ glusterfs-1.3.10/xlators/protocol/client/src/Makefile.am 2008-08-13 20:18:23.000000000 +0200 +@@ -15,10 +15,12 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + +-xlator_PROGRAMS = client.so ++xlator_LTLIBRARIES = client.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol - server_so_SOURCES = server-protocol.c -+server_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so +-client_so_SOURCES = client-protocol.c ++client_la_SOURCES = client-protocol.c ++client_la_LDFLAGS = -module -avoid-version + - noinst_HEADERS = server-protocol.h + noinst_HEADERS = client-protocol.h AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ ---- glusterfs-1.3.10/xlators/storage/posix/src/Makefile.am.link-fix 2008-08-07 13:54:50.000000000 +0000 -+++ glusterfs-1.3.10/xlators/storage/posix/src/Makefile.am 2008-08-07 13:56:27.000000000 +0000 -@@ -19,6 +19,8 @@ xlator_PROGRAMS = posix.so - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage +--- glusterfs-1.3.10/xlators/protocol/server/src/Makefile.am-fix_link 2008-08-13 20:14:16.000000000 +0200 ++++ glusterfs-1.3.10/xlators/protocol/server/src/Makefile.am 2008-08-13 20:17:06.000000000 +0200 +@@ -15,10 +15,12 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. - posix_so_SOURCES = posix.c -+posix_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so -+ - noinst_HEADERS = posix.h - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) -Wall \ ---- glusterfs-1.3.10/xlators/encryption/rot-13/src/Makefile.am.link-fix 2008-08-07 15:17:28.000000000 +0000 -+++ glusterfs-1.3.10/xlators/encryption/rot-13/src/Makefile.am 2008-08-07 15:17:42.000000000 +0000 -@@ -18,6 +18,8 @@ xlator_PROGRAMS = rot-13.so - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption +-xlator_PROGRAMS = server.so ++xlator_LTLIBRARIES = server.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol - rot_13_so_SOURCES = rot-13.c -+rot_13_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so +-server_so_SOURCES = server-protocol.c ++server_la_SOURCES = server-protocol.c ++server_la_LDFLAGS = -module -avoid-version + - noinst_HEADERS = rot-13.h + noinst_HEADERS = server-protocol.h AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ ---- glusterfs-1.3.10/xlators/performance/write-behind/src/Makefile.am.link-fix 2008-08-07 14:42:08.000000000 +0000 -+++ glusterfs-1.3.10/xlators/performance/write-behind/src/Makefile.am 2008-08-07 14:44:20.000000000 +0000 -@@ -18,6 +18,7 @@ xlator_PROGRAMS = write-behind.so - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - - write_behind_so_SOURCES = write-behind.c -+write_behind_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so - - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ - -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) ---- glusterfs-1.3.10/xlators/performance/booster/src/Makefile.am.link-fix 2008-08-07 14:59:23.000000000 +0000 -+++ glusterfs-1.3.10/xlators/performance/booster/src/Makefile.am 2008-08-07 14:59:52.000000000 +0000 -@@ -23,6 +23,7 @@ booster_so_CFLAGS = -fPIC -D_FILE_OFFSET - -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles \ - -D$(GF_HOST_OS) $(GF_DARWIN_BUNDLE_CFLAGS) - booster_so_LDFLAGS = -shared $(GF_DARWIN_BUNDLE_CFLAGS) -+booster_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so +--- glusterfs-1.3.10/xlators/storage/posix/src/Makefile.am-fix_link 2008-08-13 20:10:23.000000000 +0200 ++++ glusterfs-1.3.10/xlators/storage/posix/src/Makefile.am 2008-08-13 20:10:57.000000000 +0200 +@@ -15,12 +15,14 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. - noinst_HEADERS = booster.h ---- glusterfs-1.3.10/xlators/performance/io-cache/src/Makefile.am.link-fix 2008-08-07 14:57:50.000000000 +0000 -+++ glusterfs-1.3.10/xlators/performance/io-cache/src/Makefile.am 2008-08-07 14:58:00.000000000 +0000 -@@ -18,6 +18,7 @@ xlator_PROGRAMS = io-cache.so - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - - io_cache_so_SOURCES = io-cache.c page.c ioc-inode.c -+io_cache_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so - - noinst_HEADERS = io-cache.h - ---- glusterfs-1.3.10/xlators/performance/read-ahead/src/Makefile.am.link-fix 2008-08-07 14:54:44.000000000 +0000 -+++ glusterfs-1.3.10/xlators/performance/read-ahead/src/Makefile.am 2008-08-07 14:55:16.000000000 +0000 -@@ -19,6 +19,8 @@ xlatordir = $(libdir)/glusterfs/$(PACKAG +-xlator_PROGRAMS = posix.so ++xlator_LTLIBRARIES = posix.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage - read_ahead_so_SOURCES = read-ahead.c page.c +-posix_so_SOURCES = posix.c ++posix_la_SOURCES = posix.c + noinst_HEADERS = posix.h -+read_ahead_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so ++posix_la_LDFLAGS = -module -avoid-version + - noinst_HEADERS = read-ahead.h + AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) -Wall \ + -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles \ + $(GF_DARWIN_BUNDLE_CFLAGS) +--- glusterfs-1.3.10/xlators/encryption/rot-13/src/Makefile.am-fix_link 2008-08-14 10:26:13.000000000 +0200 ++++ glusterfs-1.3.10/xlators/encryption/rot-13/src/Makefile.am 2008-08-14 10:26:46.000000000 +0200 +@@ -14,10 +14,12 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ ---- glusterfs-1.3.10/xlators/performance/io-threads/src/Makefile.am.link-fix 2008-08-07 14:56:15.000000000 +0000 -+++ glusterfs-1.3.10/xlators/performance/io-threads/src/Makefile.am 2008-08-07 14:56:31.000000000 +0000 -@@ -18,6 +18,8 @@ xlator_PROGRAMS = io-threads.so - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance +-xlator_PROGRAMS = rot-13.so ++xlator_LTLIBRARIES = rot-13.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption - io_threads_so_SOURCES = io-threads.c -+io_threads_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so +-rot_13_so_SOURCES = rot-13.c ++rot_13_la_SOURCES = rot-13.c ++rot_13_la_LDFLAGS = -module -avoid-version + - noinst_HEADERS = io-threads.h - - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ ---- glusterfs-1.3.10/transport/tcp/client/src/Makefile.am.link-fix 2008-08-07 15:46:26.000000000 +0000 -+++ glusterfs-1.3.10/transport/tcp/client/src/Makefile.am 2008-08-07 15:46:36.000000000 +0000 -@@ -18,6 +18,7 @@ transport_PROGRAMS = client.so - transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport/tcp/ - - client_so_SOURCES = tcp-client.c $(top_srcdir)/transport/tcp/tcp.c -+client_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so - - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ - -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/transport/tcp/ -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) ---- glusterfs-1.3.10/transport/tcp/server/src/Makefile.am.link-fix 2008-08-07 15:47:11.000000000 +0000 -+++ glusterfs-1.3.10/transport/tcp/server/src/Makefile.am 2008-08-07 15:47:21.000000000 +0000 -@@ -18,6 +18,7 @@ transport_PROGRAMS = server.so - transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport/tcp/ - - server_so_SOURCES = tcp-server.c $(top_srcdir)/transport/tcp/tcp.c -+server_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so - - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ - -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/transport/tcp/ -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) ---- glusterfs-1.3.10/transport/ib-sdp/client/src/Makefile.am.link-fix 2008-08-07 15:48:34.000000000 +0000 -+++ glusterfs-1.3.10/transport/ib-sdp/client/src/Makefile.am 2008-08-07 15:48:42.000000000 +0000 -@@ -18,6 +18,7 @@ transport_PROGRAMS = client.so - transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport/ib-sdp - - client_so_SOURCES = ib-sdp-client.c $(top_srcdir)/transport/ib-sdp/ib-sdp.c -+client_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so - - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ - -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/transport/ib-sdp -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) ---- glusterfs-1.3.10/transport/ib-sdp/server/src/Makefile.am.link-fix 2008-08-07 15:49:43.000000000 +0000 -+++ glusterfs-1.3.10/transport/ib-sdp/server/src/Makefile.am 2008-08-07 15:49:52.000000000 +0000 -@@ -18,6 +18,7 @@ transport_PROGRAMS = server.so - transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport/ib-sdp + noinst_HEADERS = rot-13.h - server_so_SOURCES = ib-sdp-server.c $(top_srcdir)/transport/ib-sdp/ib-sdp.c -+server_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so + AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ +--- glusterfs-1.3.10/xlators/performance/write-behind/src/Makefile.am-fix_link 2008-08-13 20:19:41.000000000 +0200 ++++ glusterfs-1.3.10/xlators/performance/write-behind/src/Makefile.am 2008-08-13 20:20:12.000000000 +0200 +@@ -14,10 +14,11 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ - -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/transport/ib-sdp -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) ---- glusterfs-1.3.10/transport/ib-verbs/client/src/Makefile.am.link-fix 2008-08-07 15:53:35.000000000 +0000 -+++ glusterfs-1.3.10/transport/ib-verbs/client/src/Makefile.am 2008-08-07 15:53:47.000000000 +0000 -@@ -18,7 +18,7 @@ transport_PROGRAMS = client.so - transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport/ib-verbs - - client_so_SOURCES = ib-verbs-client.c $(top_srcdir)/transport/ib-verbs/ib-verbs.c --client_so_LDADD = -libverbs -+client_so_LDADD = -libverbs $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so +-xlator_PROGRAMS = write-behind.so ++xlator_LTLIBRARIES = write-behind.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ - -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/transport/ib-verbs -shared -nostartfiles ---- glusterfs-1.3.10/transport/ib-verbs/server/src/Makefile.am.link-fix 2008-08-07 15:52:18.000000000 +0000 -+++ glusterfs-1.3.10/transport/ib-verbs/server/src/Makefile.am 2008-08-07 15:52:33.000000000 +0000 -@@ -18,7 +18,7 @@ transport_PROGRAMS = server.so - transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport/ib-verbs - - server_so_SOURCES = ib-verbs-server.c $(top_srcdir)/transport/ib-verbs/ib-verbs.c --server_so_LDADD = -libverbs -+server_so_LDADD = -libverbs $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so +-write_behind_so_SOURCES = write-behind.c ++write_behind_la_SOURCES = write-behind.c ++write_behind_la_LDFLAGS = -module -avoid-version AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ - -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/transport/ib-verbs -shared -nostartfiles ---- glusterfs-1.3.10/scheduler/nufa/src/Makefile.am.link-fix 2008-08-07 15:39:37.000000000 +0000 -+++ glusterfs-1.3.10/scheduler/nufa/src/Makefile.am 2008-08-07 15:40:07.000000000 +0000 -@@ -18,6 +18,8 @@ sched_PROGRAMS = nufa.so - scheddir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler + -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) +--- glusterfs-1.3.10/xlators/performance/booster/src/Makefile.am-fix_link 2008-08-13 20:25:12.000000000 +0200 ++++ glusterfs-1.3.10/xlators/performance/booster/src/Makefile.am 2008-08-14 10:05:45.000000000 +0200 +@@ -14,15 +14,16 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. - nufa_so_SOURCES = nufa.c -+nufa_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so -+ - noinst_HEADERS = nufa.h +-xlator_PROGRAMS = booster.so ++xlator_LTLIBRARIES = booster.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ ---- glusterfs-1.3.10/scheduler/rr/src/Makefile.am.link-fix 2008-08-07 15:41:57.000000000 +0000 -+++ glusterfs-1.3.10/scheduler/rr/src/Makefile.am 2008-08-07 15:42:24.000000000 +0000 -@@ -18,6 +18,8 @@ sched_PROGRAMS = rr.so - scheddir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler +-booster_so_SOURCES = booster.c ++booster_la_SOURCES = booster.c - rr_so_SOURCES = rr.c -+rr_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so -+ - noinst_HEADERS = rr.h +-booster_so_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall \ ++booster_la_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall \ + -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles \ + -D$(GF_HOST_OS) $(GF_DARWIN_BUNDLE_CFLAGS) +-booster_so_LDFLAGS = -shared $(GF_DARWIN_BUNDLE_CFLAGS) ++booster_la_LDFLAGS = -shared $(GF_DARWIN_BUNDLE_CFLAGS) \ ++ -module -avoid-version - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ ---- glusterfs-1.3.10/scheduler/alu/src/Makefile.am.link-fix 2008-08-07 15:36:16.000000000 +0000 -+++ glusterfs-1.3.10/scheduler/alu/src/Makefile.am 2008-08-07 15:36:38.000000000 +0000 -@@ -18,6 +18,8 @@ sched_PROGRAMS = alu.so - scheddir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler + noinst_HEADERS = booster.h - alu_so_SOURCES = alu.c -+alu_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so -+ - noinst_HEADERS = alu.h +--- glusterfs-1.3.10/xlators/performance/io-cache/src/Makefile.am-fix_link 2008-08-13 20:23:53.000000000 +0200 ++++ glusterfs-1.3.10/xlators/performance/io-cache/src/Makefile.am 2008-08-13 20:24:33.000000000 +0200 +@@ -14,10 +14,11 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ ---- glusterfs-1.3.10/scheduler/random/src/Makefile.am.link-fix 2008-08-07 15:37:27.000000000 +0000 -+++ glusterfs-1.3.10/scheduler/random/src/Makefile.am 2008-08-07 15:37:37.000000000 +0000 -@@ -18,6 +18,8 @@ sched_PROGRAMS = random.so - scheddir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler +-xlator_PROGRAMS = io-cache.so ++xlator_LTLIBRARIES = io-cache.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - random_so_SOURCES = random.c -+random_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so -+ - noinst_HEADERS = random.h +-io_cache_so_SOURCES = io-cache.c page.c ioc-inode.c ++io_cache_la_SOURCES = io-cache.c page.c ioc-inode.c ++io_cache_la_LDFLAGS = -module -avoid-version - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ ---- glusterfs-1.3.10/scheduler/switch/src/Makefile.am.link-fix 2008-08-07 15:43:19.000000000 +0000 -+++ glusterfs-1.3.10/scheduler/switch/src/Makefile.am 2008-08-07 15:43:28.000000000 +0000 -@@ -18,6 +18,7 @@ sched_PROGRAMS = switch.so - scheddir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler + noinst_HEADERS = io-cache.h - switch_so_SOURCES = switch.c -+switch_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so +--- glusterfs-1.3.10/xlators/performance/read-ahead/src/Makefile.am-fix_link 2008-08-13 20:20:54.000000000 +0200 ++++ glusterfs-1.3.10/xlators/performance/read-ahead/src/Makefile.am 2008-08-13 20:22:02.000000000 +0200 +@@ -14,10 +14,11 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ - -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) ---- glusterfs-1.3.10/xlators/cluster/unify/src/Makefile.am.link_fix 2008-08-07 16:06:38.000000000 +0000 -+++ glusterfs-1.3.10/xlators/cluster/unify/src/Makefile.am 2008-08-07 16:07:07.000000000 +0000 -@@ -19,6 +19,8 @@ xlator_PROGRAMS = unify.so - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster +-xlator_PROGRAMS = read-ahead.so ++xlator_LTLIBRARIES = read-ahead.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - unify_so_SOURCES = unify.c unify-self-heal.c -+unify_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so -+ - noinst_HEADERS = unify.h +-read_ahead_so_SOURCES = read-ahead.c page.c ++read_ahead_la_SOURCES = read-ahead.c page.c ++read_ahead_la_LDFLAGS = -module -avoid-version - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ ---- glusterfs-1.3.10/xlators/cluster/afr/src/Makefile.am.link_fix 2008-08-07 16:08:13.000000000 +0000 -+++ glusterfs-1.3.10/xlators/cluster/afr/src/Makefile.am 2008-08-07 16:08:22.000000000 +0000 -@@ -18,6 +18,8 @@ xlator_PROGRAMS = afr.so - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster + noinst_HEADERS = read-ahead.h - afr_so_SOURCES = afr.c afr_self_heal.c -+afr_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so -+ - noinst_HEADERS = afr.h +--- glusterfs-1.3.10/xlators/performance/io-threads/src/Makefile.am-fix_link 2008-08-13 20:22:43.000000000 +0200 ++++ glusterfs-1.3.10/xlators/performance/io-threads/src/Makefile.am 2008-08-13 20:23:09.000000000 +0200 +@@ -14,10 +14,12 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ ---- glusterfs-1.3.10/xlators/protocol/client/src/Makefile.am.link_fix 2008-08-07 16:09:29.000000000 +0000 -+++ glusterfs-1.3.10/xlators/protocol/client/src/Makefile.am 2008-08-07 16:09:43.000000000 +0000 -@@ -19,6 +19,8 @@ xlator_PROGRAMS = client.so - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol +-xlator_PROGRAMS = io-threads.so ++xlator_LTLIBRARIES = io-threads.la + xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - client_so_SOURCES = client-protocol.c -+client_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so +-io_threads_so_SOURCES = io-threads.c ++io_threads_la_SOURCES = io-threads.c ++io_threads_la_LDFLAGS = -module -avoid-version + - noinst_HEADERS = client-protocol.h - - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ ---- glusterfs-1.3.10/transport/unix/client/src/Makefile.am.link_fix 2008-08-07 16:16:08.000000000 +0000 -+++ glusterfs-1.3.10/transport/unix/client/src/Makefile.am 2008-08-07 16:16:36.000000000 +0000 -@@ -18,6 +18,7 @@ transport_PROGRAMS = client.so - transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport/unix/ - - client_so_SOURCES = unix-client.c $(top_srcdir)/transport/unix/unix.c -+client_so_LDADD = $(top_builddir)/libglusterfs/src/.libs/libglusterfs.so - - AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ - -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/transport/unix/ -shared -nostartfiles $(GF_DARWIN_BUNDLE_CFLAGS) ---- glusterfs-1.3.10/transport/unix/server/src/Makefile.am.link_fix 2008-08-07 16:18:37.000000000 +0000 -+++ glusterfs-1.3.10/transport/unix/server/src/Makefile.am 2008-08-07 16:18:48.000000000 +0000 <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/glusterfs-link_fix.patch?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
