removed wxBusyCursorSuspender use

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 4a35dd171f27b9fefb14eadc8ec7a7963b137c4f..d900a7c5af944a7383b4bac25a484e000e2f305a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,13 +19,13 @@ include ./src/make.env
 .SUFFIXES:     .o .cpp .c .cxx
 
 .c.o :
-       $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
+       $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
 
 .cpp.o :
-       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+       $(CC) -c @DEP_INFO_FLAGS@ $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
 
 .cxx.o :
-       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+       $(CC) -c @DEP_INFO_FLAGS@ $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
 
 ########################### Paths #################################
 
@@ -41,6 +41,7 @@ VP6 = @top_srcdir@/src/png
 VP7 = @top_srcdir@/src/jpeg
 VP8 = @top_srcdir@/src/tiff
 VP9 = @top_srcdir@/src/zlib
+VPA = @top_srcdir@/src/regex
 VP10 = @top_srcdir@/src/iodbc
 VP11 = @top_srcdir@/src/msw/ole
 VP12 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
@@ -49,7 +50,7 @@ VP13 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_I
 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
 # any VPATH assignment not containing ':'
-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -157,7 +158,7 @@ WX_LINGUAS = `cd $(top_srcdir)/locale && ls *.mo 2> /dev/null | sed -n 's/\.mo//
 # this line will include a file which defines ALL_SOURCES, ALL_OBJECTS,
 # ALL_DEPFILES and ALL_HEADERS variables with the complete list of .cpp, .o,
 # .d and .h/.inl files for the current toolkit
-include $(top_srcdir)/@PORT_FILES@
+include @PORT_FILES@
 
 SOURCES = $(ALL_SOURCES)
 HEADERS = $(ALL_HEADERS)
@@ -169,7 +170,13 @@ DEPFILES = @ALL_DEPFILES@
 
 # the object files of sublibraries (we assume that they don't change [often],
 # so we don't generate these lists with tmake but embed them here)
-ZLIBOBJS    = \
+REGEXOBJS = \
+               regcomp.o \
+               regexec.o \
+               regerror.o \
+               regfree.o
+
+ZLIBOBJS = \
                adler32.o \
                compress.o \
                crc32.o \
@@ -185,7 +192,7 @@ ZLIBOBJS    = \
                infutil.o \
                inffast.o
 
-PNGOBJS     = \
+PNGOBJS = \
                png.o \
                pngread.o \
                pngrtran.o \
@@ -221,7 +228,7 @@ FREETYPEOBJS = \
                type1z.o \
                winfnt.o
 
-JPEGOBJS    = \
+JPEGOBJS = \
                jcomapi.o \
                jutils.o \
                jerror.o \
@@ -269,7 +276,7 @@ JPEGOBJS    = \
                jquant2.o \
                jdmerge.o
 
-TIFFOBJS       = \
+TIFFOBJS = \
                tif_aux.o \
                tif_close.o \
                tif_codec.o \
@@ -350,9 +357,9 @@ all: @WX_ALL@
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
 
-@WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o
+@WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o @WX_LIBRARY_NAME_SHARED@
        @$(INSTALL) -d ./lib
-       $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
+       $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o ./lib/@WX_LIBRARY_NAME_SHARED@ $(EXTRALIBS) $(OPENGLLIBS)
 
 ./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r: ./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc
        $(DEREZ) $^ $(DEREZFLAGS) > $@
@@ -422,7 +429,7 @@ lexer.c:    $(COMMDIR)/lexer.l
 -include $(DEPFILES)
 
 afminstall: preinstall
-       $(INSTALL) -d $(datadir)
+       @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
        $(INSTALL) -d $(datadir)/wx
        $(INSTALL) -d $(datadir)/wx/afm
        $(INSTALL) -d $(datadir)/wx/gs_afm
@@ -436,9 +443,9 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_N
        @echo " Installing wxWindows..."
        @echo " "
 
-       $(INSTALL) -d $(prefix)
-       $(INSTALL) -d $(bindir)
-       $(INSTALL) -d $(libdir)
+       @if test ! -d $(prefix); then $(INSTALL) -d $(prefix); fi
+       @if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi
+       @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
 
        $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config
        cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
@@ -461,10 +468,10 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_N
          echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
        done
 
-       $(INSTALL) -d $(localedir)
+       @if test ! -d $(localedir); then $(INSTALL) -d $(localedir); fi
        @for p in $(WX_LINGUAS); do \
-         $(INSTALL) -d $(localedir)/$$p; \
-         $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; \
+         if test ! -d $(localedir)/$$p; then $(INSTALL) -d $(localedir)/$$p; fi;\
+         if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; fi;\
          $(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
          echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
        done
@@ -473,7 +480,7 @@ preinstall_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@
        @echo " "
        @echo " Installing wxWindows OpenGl add-on..."
        @echo " "
-       $(INSTALL) -d $(libdir)
+       @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
        $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
 
 install: @AFMINSTALL@ @WX_ALL_INSTALLED@
@@ -1367,7 +1374,7 @@ clean:
        $(RM) *.d
        $(RM) parser.c
        $(RM) lexer.c
-       $(RM) -r ./lib/wx/*
+       # $(RM) -r ./lib/wx/*
        $(RM) ./lib/lib*
 
 cleanall: clean