fixes for contrib build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
961c54c333
commit
2dc5bacc01
@ -1,6 +1,6 @@
|
||||
# $Id$
|
||||
|
||||
CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xrc plot applet fl
|
||||
CONTRIB_SAMPLES=canvas fl gizmos mmedia net ogl plot stc xrc #applet
|
||||
|
||||
all:
|
||||
@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
|
||||
|
@ -1,6 +1,6 @@
|
||||
# $Id$
|
||||
|
||||
CONTRIB_SUBDIRS=ogl mmedia stc xrc plot canvas animate fl #applet
|
||||
CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc xrc #applet
|
||||
|
||||
all:
|
||||
@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
|
||||
|
@ -63,9 +63,9 @@ libtype_so: $(top_builddir)/lib/$(TARGETLIB_SHARED)
|
||||
|
||||
libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC)
|
||||
|
||||
$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS) $(top_builddir)/lib/@WX_LIBRARY_NAME_SHARED@
|
||||
$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS)
|
||||
@$(INSTALL) -d $(top_builddir)/lib
|
||||
$(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) -L$(top_builddir)/lib @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS)
|
||||
$(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS)
|
||||
cd $(top_builddir)/lib \
|
||||
&& $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
|
||||
&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
|
||||
|
Loading…
Reference in New Issue
Block a user