*** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
####################### GENERAL SETTINGS ############################
|
||||
|
||||
# see comment near LDFLAGS at the end of file
|
||||
EXTRALIBS = @LDFLAGS@ @LIBS@ @DMALLOC_LIBS@
|
||||
EXTRALIBS = @LDFLAGS@ @LDFLAGS_VERSIONING@ @LIBS@ @DMALLOC_LIBS@
|
||||
OPENGLLIBS = @OPENGL_LIBS@
|
||||
LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
|
||||
|
||||
|
||||
@@ -41,6 +41,8 @@ TARGETLIB_LINK2 = $(TARGET_LIBNAME).so
|
||||
|
||||
TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@
|
||||
|
||||
LDFLAGS_VERSIONING = @LDFLAGS_VERSIONING@
|
||||
|
||||
# NB: see remark in Makefile.in as to why we don't use %.foo: %.bar rules
|
||||
.SUFFIXES: .o .c .cpp .cxx
|
||||
|
||||
@@ -68,7 +70,7 @@ libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC)
|
||||
|
||||
$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS)
|
||||
@$(INSTALL) -d $(top_builddir)/lib
|
||||
$(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS)
|
||||
$(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) $(LDFLAGS_VERSIONING)
|
||||
cd $(top_builddir)/lib \
|
||||
&& $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
|
||||
&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
|
||||
|
||||
Reference in New Issue
Block a user