← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/firebird2.1/oneiric

« back to all changes in this revision

Viewing changes to builds/posix/Makefile.in.libfbclient

  • Committer: Bazaar Package Importer
  • Author(s): Damyan Ivanov
  • Date: 2011-04-22 18:59:44 UTC
  • mfrom: (2.1.24 sid)
  • Revision ID: james.westby@ubuntu.com-20110422185944-egwy9r5xynjddku5
Tags: 2.1.4.18393-0.ds2-2
* apply patch from upstream SVN fixing ICU collations
* remove lintian overrides about manpages shipped in dependency package
* claim compliancy with Policy 3.9.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
builds/posix/Makefile.in.libfbclient
30
30
#
31
31
ROOT=..
32
32
ObjModuleType=superclient
33
 
CFLAGS+=-DSUPERCLIENT @PTHREAD_CFLAGS@
 
33
FB_CFLAGS+=-DSUPERCLIENT @PTHREAD_CFLAGS@
34
34
 
35
35
include     $(ROOT)/gen/make.defaults
36
36
include     $(ROOT)/gen/make.platform
109
109
        (cd $(LIB) && $(LN) -f $(ClientLibraryNameMajor) $(ClientLibraryName) )
110
110
endif
111
111
 
 
112
ifeq (@VOID_PTR_SIZE@,8)
 
113
GCCS=-lgcc_s.10.5
 
114
else
 
115
GCCS=-lgcc_s.10.4
 
116
endif
 
117
 
112
118
$(LIBFBCLIENT_SO):      $(FBCLIENT_Objects)
113
119
ifeq ($(PLATFORM),DARWIN)
114
 
        $(CLIENTLIB_LINK) $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB) \
 
120
        $(LIB_LINK) -nodefaultlibs $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB) \
115
121
$(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SONAME) \
116
 
-o $@ $^ $(SO_LINK_LIBS) $(STATIC_CXXSUPPORT_LIB) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
 
122
-o $@ $^ $(SO_LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -lsupc++ $(GCCS) -lgcc_eh -lSystem
117
123
else
118
124
        $(CLIENTLIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB) \
119
 
$(LIB_LINK_SONAME)$(ClientLibraryNameMajor) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib \
 
125
$(LIB_LINK_SONAME)$(ClientLibraryNameMajor) \
120
126
-o $@ $^ $(SO_LINK_LIBS) $(STATIC_CXXSUPPORT_LIB) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
121
127
endif
122
128