From 2c7484a1af573ce49f3c466f69cc130d84dfec5b Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Fri, 19 Mar 2010 14:32:49 +1100 Subject: [PATCH] remove ipc so from makefiles Signed-off-by: Angus Salkeld --- lib/poll/Makefile.am | 6 +++--- lib/timer/Makefile.am | 6 +++--- lib/tsafe/Makefile.am | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/poll/Makefile.am b/lib/poll/Makefile.am index 4d7ce9d..1302ebc 100644 --- a/lib/poll/Makefile.am +++ b/lib/poll/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = libqbpoll.versions if BUILD_DARWIN -lib%.so.$(SONAME): %.o libqbipcc.so.$(SONAME) +lib%.so.$(SONAME): %.o $(CC) $(DARWIN_OPTS) $^ -o $@ ln -sf lib$*.so.$(SONAME) lib$*.so ln -sf lib$*.so.$(SONAME) lib$*.so.$(SOMAJOR) @@ -60,7 +60,7 @@ else if BUILD_SOLARIS lib%.so.$(SONAME): %.o - $(LD) $(SOLARIS_OPTS) -G $^ -o $@ -lqbipcc + $(LD) $(SOLARIS_OPTS) -G $^ -o $@ ln -sf lib$*.so.$(SONAME) lib$*.so ln -sf lib$*.so.$(SONAME) lib$*.so.$(SOMAJOR) @@ -70,7 +70,7 @@ libqb%.so.$(SONAME): %.o $(CC) -shared -o $@ \ -Wl,-soname=libqb$*.so.$(SOMAJOR) \ -Wl,-version-script=$(srcdir)/libqb$*.versions \ - $^ $(LDFLAGS) -lqbipcc $(AM_LDFLAGS) + $^ $(LDFLAGS) $(AM_LDFLAGS) ln -sf libqb$*.so.$(SONAME) libqb$*.so ln -sf libqb$*.so.$(SONAME) libqb$*.so.$(SOMAJOR) diff --git a/lib/timer/Makefile.am b/lib/timer/Makefile.am index 11fd49f..bb99fdb 100644 --- a/lib/timer/Makefile.am +++ b/lib/timer/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = libqbtimer.versions if BUILD_DARWIN -lib%.so.$(SONAME): %.o libqbipcc.so.$(SONAME) +lib%.so.$(SONAME): %.o $(CC) $(DARWIN_OPTS) $^ -o $@ ln -sf lib$*.so.$(SONAME) lib$*.so ln -sf lib$*.so.$(SONAME) lib$*.so.$(SOMAJOR) @@ -60,7 +60,7 @@ else if BUILD_SOLARIS lib%.so.$(SONAME): %.o - $(LD) $(SOLARIS_OPTS) -G $^ -o $@ -lqbipcc + $(LD) $(SOLARIS_OPTS) -G $^ -o $@ ln -sf lib$*.so.$(SONAME) lib$*.so ln -sf lib$*.so.$(SONAME) lib$*.so.$(SOMAJOR) @@ -70,7 +70,7 @@ libqb%.so.$(SONAME): %.o $(CC) -shared -o $@ \ -Wl,-soname=libqb$*.so.$(SOMAJOR) \ -Wl,-version-script=$(srcdir)/libqb$*.versions \ - $^ $(LDFLAGS) -lqbipcc $(AM_LDFLAGS) + $^ $(LDFLAGS) $(AM_LDFLAGS) ln -sf libqb$*.so.$(SONAME) libqb$*.so ln -sf libqb$*.so.$(SONAME) libqb$*.so.$(SOMAJOR) diff --git a/lib/tsafe/Makefile.am b/lib/tsafe/Makefile.am index 39d37d4..8bb1bc6 100644 --- a/lib/tsafe/Makefile.am +++ b/lib/tsafe/Makefile.am @@ -50,7 +50,7 @@ noinst_HEADERS = libqbtsafe.versions if BUILD_DARWIN -lib%.so.$(SONAME): %.o libqbipcc.so.$(SONAME) +lib%.so.$(SONAME): %.o $(CC) $(DARWIN_OPTS) $^ -o $@ ln -sf lib$*.so.$(SONAME) lib$*.so ln -sf lib$*.so.$(SONAME) lib$*.so.$(SOMAJOR) @@ -60,7 +60,7 @@ else if BUILD_SOLARIS lib%.so.$(SONAME): %.o - $(LD) $(SOLARIS_OPTS) -G $^ -o $@ -lqbipcc + $(LD) $(SOLARIS_OPTS) -G $^ -o $@ ln -sf lib$*.so.$(SONAME) lib$*.so ln -sf lib$*.so.$(SONAME) lib$*.so.$(SOMAJOR) @@ -70,7 +70,7 @@ libqb%.so.$(SONAME): %.o $(CC) -shared -o $@ \ -Wl,-soname=libqb$*.so.$(SOMAJOR) \ -Wl,-version-script=$(srcdir)/libqb$*.versions \ - $^ $(LDFLAGS) -lqbipcc $(AM_LDFLAGS) + $^ $(LDFLAGS) $(AM_LDFLAGS) ln -sf libqb$*.so.$(SONAME) libqb$*.so ln -sf libqb$*.so.$(SONAME) libqb$*.so.$(SOMAJOR)