more compilation fixes, some object files were missing

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index ef4e84bd29fe860d99fc331f6690080557f5735c..bf2436fd47fd348f91e89a0975d7f42b556ca5d3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,8 @@
 #
 # This file was automatically generated by tmake at 15:55, 1999/08/13
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 #
 # This file was automatically generated by tmake at 15:55, 1999/08/13
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!

-
+# -----> Is this true, where is it? I had to make lots of changes here to get
+#        it to work! KB

 #
 # File:     makefile.unx
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
 #
 # File:     makefile.unx
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin


@@ -558,6 +559,9 @@ GTK_GENERICOBJS = \
                src/generic/dirdlgg.o \
                src/generic/fontdlgg.o \
                src/generic/gridg.o \
                src/generic/dirdlgg.o \
                src/generic/fontdlgg.o \
                src/generic/gridg.o \

+               src/generic/helphtml.o \
+               src/generic/helpwxht.o \
+               src/generic/helpext.o \

                src/generic/imaglist.o \
                src/generic/laywin.o \
                src/generic/listctrl.o \
                src/generic/imaglist.o \
                src/generic/laywin.o \
                src/generic/listctrl.o \


@@ -727,7 +731,10 @@ MOTIF_GENERICOBJS = \
                src/generic/dirdlgg.o \
                src/generic/fontdlgg.o \
                src/generic/gridg.o \
                src/generic/dirdlgg.o \
                src/generic/fontdlgg.o \
                src/generic/gridg.o \

+               src/generic/helphtml.o \

                src/generic/helpxlp.o \
                src/generic/helpxlp.o \

+               src/generic/helpwxht.o \
+               src/generic/helpext.o \

                src/generic/imaglist.o \
                src/generic/laywin.o \
                src/generic/listctrl.o \
                src/generic/imaglist.o \
                src/generic/laywin.o \
                src/generic/listctrl.o \


@@ -892,6 +899,8 @@ MSW_GENERICOBJS = \
                src/generic/choicdgg.o \
                src/generic/dirdlgg.o \
                src/generic/gridg.o \
                src/generic/choicdgg.o \
                src/generic/dirdlgg.o \
                src/generic/gridg.o \

+               src/generic/helphtml.o \
+               src/generic/helpwxht.o \

                src/generic/laywin.o \
                src/generic/numdlgg.o \
                src/generic/panelg.o \
                src/generic/laywin.o \
                src/generic/numdlgg.o \
                src/generic/panelg.o \


@@ -1213,7 +1222,7 @@ $(REQUIRED_DIRS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDI
 
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
        $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
 
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
        $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)

-       
+

 CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
        @if test -e ./lib/@WX_LIBRARY_LINK1@; then rm -f ./lib/@WX_LIBRARY_LINK1@; fi
        @if test -e ./lib/@WX_LIBRARY_LINK2@; then rm -f ./lib/@WX_LIBRARY_LINK2@; fi
 CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
        @if test -e ./lib/@WX_LIBRARY_LINK1@; then rm -f ./lib/@WX_LIBRARY_LINK1@; fi
        @if test -e ./lib/@WX_LIBRARY_LINK2@; then rm -f ./lib/@WX_LIBRARY_LINK2@; fi


@@ -1221,7 +1230,7 @@ CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
        $(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_LINK3@
        $(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_LINK3@

-       
+

 CREATE_INSTALLED_LINKS:  $(libdir)/@WX_TARGET_LIBRARY@
        @if test -e $(libdir)/@WX_LIBRARY_LINK1@; then rm -f $(libdir)/@WX_LIBRARY_LINK1@; fi
        @if test -e $(libdir)/@WX_LIBRARY_LINK2@; then rm -f $(libdir)/@WX_LIBRARY_LINK2@; fi
 CREATE_INSTALLED_LINKS:  $(libdir)/@WX_TARGET_LIBRARY@
        @if test -e $(libdir)/@WX_LIBRARY_LINK1@; then rm -f $(libdir)/@WX_LIBRARY_LINK1@; fi
        @if test -e $(libdir)/@WX_LIBRARY_LINK2@; then rm -f $(libdir)/@WX_LIBRARY_LINK2@; fi


@@ -1229,7 +1238,7 @@ CREATE_INSTALLED_LINKS:  $(libdir)/@WX_TARGET_LIBRARY@
        $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@
        $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@
        $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@
        $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@
        $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@
        $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@

-       
+

 $(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
 
 parser.o:    parser.c lexer.c
 $(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
 
 parser.o:    parser.c lexer.c


@@ -1267,9 +1276,9 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
 
        $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
        $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
 
        $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
        $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@

-       
+

        $(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 $(includedir)/wx
        $(INSTALL) -d $(includedir)/wx/msw
        $(INSTALL) -d $(includedir)/wx/gtk
        $(INSTALL) -d $(includedir)/wx
        $(INSTALL) -d $(includedir)/wx/msw
        $(INSTALL) -d $(includedir)/wx/gtk


@@ -1282,7 +1291,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
          $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
          echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
        done
          $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
          echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
        done

-       
+

 write_message:
        echo " "
        @echo " The installation of wxWindows is finished.  On certain"
 write_message:
        echo " "
        @echo " The installation of wxWindows is finished.  On certain"

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index dbf130b1fbf731e4c4cf75b1670f2fc3a3da7ef7..6f28387b898cbb5f1e42a997ff6e4a1ee4b5bf81 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -36,4 +36,4 @@
 // include the most common wx headers
 #include "wx/wx.h"
 
 // include the most common wx headers
 #include "wx/wx.h"
 

-#endif // WX_PRECOMP
\ No newline at end of file
+#endif // WX_PRECOMP