Added tabg.o/tabg.d to GTK make stuff. Tabbed dialogs weren't linking correct.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
24
Makefile.in
24
Makefile.in
@@ -637,6 +637,7 @@ GTK_GENERICOBJS = \
|
|||||||
scrolwin.o \
|
scrolwin.o \
|
||||||
splitter.o \
|
splitter.o \
|
||||||
statusbr.o \
|
statusbr.o \
|
||||||
|
tabg.o \
|
||||||
textdlgg.o \
|
textdlgg.o \
|
||||||
tipdlg.o \
|
tipdlg.o \
|
||||||
treectrl.o \
|
treectrl.o \
|
||||||
@@ -670,6 +671,7 @@ GTK_GENERICDEPS = \
|
|||||||
scrolwin.d \
|
scrolwin.d \
|
||||||
splitter.d \
|
splitter.d \
|
||||||
statusbr.d \
|
statusbr.d \
|
||||||
|
tabg.d \
|
||||||
textdlgg.d \
|
textdlgg.d \
|
||||||
tipdlg.d \
|
tipdlg.d \
|
||||||
treectrl.d \
|
treectrl.d \
|
||||||
@@ -1976,7 +1978,7 @@ all: @WX_ALL@
|
|||||||
@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
|
@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
|
||||||
@$(INSTALL) -d ./lib
|
@$(INSTALL) -d ./lib
|
||||||
$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
|
$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
|
||||||
|
|
||||||
CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
|
CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
|
||||||
@$(RM) ./lib/@WX_LIBRARY_LINK1@
|
@$(RM) ./lib/@WX_LIBRARY_LINK1@
|
||||||
@$(RM) ./lib/@WX_LIBRARY_LINK2@
|
@$(RM) ./lib/@WX_LIBRARY_LINK2@
|
||||||
@@ -1984,7 +1986,7 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
|
|||||||
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
|
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
|
||||||
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
|
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
|
||||||
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
|
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
|
||||||
|
|
||||||
CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@
|
CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@
|
||||||
$(RM) $(libdir)/@WX_LIBRARY_LINK1@
|
$(RM) $(libdir)/@WX_LIBRARY_LINK1@
|
||||||
$(RM) $(libdir)/@WX_LIBRARY_LINK2@
|
$(RM) $(libdir)/@WX_LIBRARY_LINK2@
|
||||||
@@ -1992,7 +1994,7 @@ CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@
|
|||||||
$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
|
$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
|
||||||
$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
|
$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
|
||||||
$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
|
$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
|
||||||
|
|
||||||
$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
|
$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
|
||||||
|
|
||||||
parser.o: parser.c lexer.c
|
parser.o: parser.c lexer.c
|
||||||
@@ -2036,13 +2038,13 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
|
|||||||
$(INSTALL) -d $(libdir)/wx/include/wx
|
$(INSTALL) -d $(libdir)/wx/include/wx
|
||||||
$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
|
$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
|
||||||
$(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
|
$(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
|
||||||
|
|
||||||
$(INSTALL) -d $(datadir)/wx
|
$(INSTALL) -d $(datadir)/wx
|
||||||
$(INSTALL) -d $(datadir)/wx/afm
|
$(INSTALL) -d $(datadir)/wx/afm
|
||||||
$(INSTALL) -d $(datadir)/wx/gs_afm
|
$(INSTALL) -d $(datadir)/wx/gs_afm
|
||||||
$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
|
$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
|
||||||
$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
|
$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
|
||||||
|
|
||||||
$(INSTALL) -d $(includedir)/wx
|
$(INSTALL) -d $(includedir)/wx
|
||||||
$(INSTALL) -d $(includedir)/wx/msw
|
$(INSTALL) -d $(includedir)/wx/msw
|
||||||
$(INSTALL) -d $(includedir)/wx/gtk
|
$(INSTALL) -d $(includedir)/wx/gtk
|
||||||
@@ -2055,7 +2057,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
|
|||||||
$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
|
$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
|
||||||
echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
|
echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
|
||||||
done
|
done
|
||||||
|
|
||||||
write_message:
|
write_message:
|
||||||
@echo " "
|
@echo " "
|
||||||
@echo " The installation of wxWindows is finished. On certain"
|
@echo " The installation of wxWindows is finished. On certain"
|
||||||
@@ -2451,7 +2453,7 @@ SAMPLES_DIST:
|
|||||||
UTILS_DIST:
|
UTILS_DIST:
|
||||||
mkdir $(DISTDIR)/utils
|
mkdir $(DISTDIR)/utils
|
||||||
cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
|
cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
|
||||||
|
|
||||||
mkdir $(DISTDIR)/utils/wxMMedia2
|
mkdir $(DISTDIR)/utils/wxMMedia2
|
||||||
mkdir $(DISTDIR)/utils/wxMMedia2/lib
|
mkdir $(DISTDIR)/utils/wxMMedia2/lib
|
||||||
mkdir $(DISTDIR)/utils/wxMMedia2/sample
|
mkdir $(DISTDIR)/utils/wxMMedia2/sample
|
||||||
@@ -2462,7 +2464,7 @@ UTILS_DIST:
|
|||||||
cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib
|
cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib
|
||||||
cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample
|
cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample
|
||||||
cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample
|
cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample
|
||||||
|
|
||||||
mkdir $(DISTDIR)/utils/glcanvas
|
mkdir $(DISTDIR)/utils/glcanvas
|
||||||
mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
|
mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
|
||||||
cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas
|
cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas
|
||||||
@@ -2470,21 +2472,21 @@ UTILS_DIST:
|
|||||||
cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/Makefile.in $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
|
cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/Makefile.in $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
|
||||||
cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
|
cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
|
||||||
cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
|
cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
|
||||||
|
|
||||||
mkdir $(DISTDIR)/utils/ogl
|
mkdir $(DISTDIR)/utils/ogl
|
||||||
mkdir $(DISTDIR)/utils/ogl/src
|
mkdir $(DISTDIR)/utils/ogl/src
|
||||||
cp $(UTILSDIR)/ogl/Makefile.in $(DISTDIR)/utils/ogl
|
cp $(UTILSDIR)/ogl/Makefile.in $(DISTDIR)/utils/ogl
|
||||||
cp $(UTILSDIR)/ogl/src/Makefile.in $(DISTDIR)/utils/ogl/src
|
cp $(UTILSDIR)/ogl/src/Makefile.in $(DISTDIR)/utils/ogl/src
|
||||||
cp $(UTILSDIR)/ogl/src/*.h $(DISTDIR)/utils/ogl/src
|
cp $(UTILSDIR)/ogl/src/*.h $(DISTDIR)/utils/ogl/src
|
||||||
cp $(UTILSDIR)/ogl/src/*.cpp $(DISTDIR)/utils/ogl/src
|
cp $(UTILSDIR)/ogl/src/*.cpp $(DISTDIR)/utils/ogl/src
|
||||||
|
|
||||||
MISC_DIST:
|
MISC_DIST:
|
||||||
mkdir $(DISTDIR)/misc
|
mkdir $(DISTDIR)/misc
|
||||||
mkdir $(DISTDIR)/misc/afm
|
mkdir $(DISTDIR)/misc/afm
|
||||||
cp $(MISCDIR)/afm/*.afm $(DISTDIR)/misc/afm
|
cp $(MISCDIR)/afm/*.afm $(DISTDIR)/misc/afm
|
||||||
mkdir $(DISTDIR)/misc/gs_afm
|
mkdir $(DISTDIR)/misc/gs_afm
|
||||||
cp $(MISCDIR)/gs_afm/*.afm $(DISTDIR)/misc/gs_afm
|
cp $(MISCDIR)/gs_afm/*.afm $(DISTDIR)/misc/gs_afm
|
||||||
|
|
||||||
dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
|
dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
|
||||||
cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
|
cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
|
||||||
$(RM) -r _dist_dir
|
$(RM) -r _dist_dir
|
||||||
|
Reference in New Issue
Block a user