checked in forgottern parts of MSLU changes

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index f5654ed37ba0fbf21c4b0e8974a0c122499835fc..5394eb0c220c1dc7485839a3263a67b62d9d36c4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,6 +100,8 @@ TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
 REGEXDIR = $(WXDIR)/src/regex
 GTKDIR   = $(WXDIR)/src/gtk
 ZLIBDIR  = $(WXDIR)/src/zlib
 REGEXDIR = $(WXDIR)/src/regex
 GTKDIR   = $(WXDIR)/src/gtk

+X11DIR   = $(WXDIR)/src/x11
+MGLDIR   = $(WXDIR)/src/mgl

 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2


@@ -191,25 +193,6 @@ PNGOBJS = \
                pngget.o \
                pngset.o
 
                pngget.o \
                pngset.o
 

-FREETYPEOBJS = \
-               ftsystem.o \
-               autohint.o \
-               ftbase.o \
-               ftdebug.o \
-               ftglyph.o \
-               ftinit.o \
-               ftmm.o \
-               cff.o \
-               type1cid.o \
-               psnames.o \
-               psmodule.o \
-               raster1.o \
-               sfnt.o \
-               smooth.o \
-               truetype.o \
-               type1z.o \
-               winfnt.o
-

 JPEGOBJS = \
                jcomapi.o \
                jutils.o \
 JPEGOBJS = \
                jcomapi.o \
                jutils.o \


@@ -427,6 +410,7 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
 
        $(INSTALL) -d $(libdir)/wx
        $(INSTALL) -d $(libdir)/wx/include
 
        $(INSTALL) -d $(libdir)/wx
        $(INSTALL) -d $(libdir)/wx/include

+       $(INSTALL) -d $(libdir)/wx/include/univ

        $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@
        $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
        $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
        $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@
        $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
        $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \


@@ -437,6 +421,7 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi

+       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/univ; fi

        @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi
 
        @# always install msw headers for wxBase, it's much simpler
        @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi
 
        @# always install msw headers for wxBase, it's much simpler


@@ -527,6 +512,7 @@ uninstall:
        @if test -d $(includedir)/wx/msw; then rmdir $(includedir)/wx/msw; fi
        @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi
        @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi
        @if test -d $(includedir)/wx/msw; then rmdir $(includedir)/wx/msw; fi
        @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi
        @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi

+       @if test -d $(includedir)/wx/univ; then rmdir $(includedir)/wx/univ; fi

        @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi
        @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi
        @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi
        @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi
        @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi
        @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi


@@ -660,7 +646,7 @@ BASE_DIST: ALL_DIST
        cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR)
        cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR)
        cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
        cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR)
        cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR)
        cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt

-       cp $(DOCDIR)/install.txt $(DISTDIR)/README.txt
+       cp $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt

        cp $(SRCDIR)/*.in $(DISTDIR)/src
        cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
        cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
        cp $(SRCDIR)/*.in $(DISTDIR)/src
        cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
        cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common