Make wxMMedia2 compile on VC++ 5

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index bf2436fd47fd348f91e89a0975d7f42b556ca5d3..b5502050b0cafc523fe8911c6f274eb8ff90d4e6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
 
 #
 
 #

-# This file was automatically generated by tmake at 15:55, 1999/08/13
+# This file was automatically generated by tmake at 16:27, 1999/08/17

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 # 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


@@ -67,7 +66,10 @@ top_builddir = .
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@

-INSTALL_SCRIPT = @INSTALL@ # what is this supposed to be?
+# my autoconf doesn't set this
+#INSTALL_SCRIPT = @INSTALL_SCRIPT@
+# maybe do an additional chmod if needed?
+INSTALL_SCRIPT = @INSTALL@ 

 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :


@@ -175,6 +177,7 @@ WX_HEADERS = \
                gdicmn.h \
                gdiobj.h \
                grid.h \
                gdicmn.h \
                gdiobj.h \
                grid.h \

+               gsocket.h \

                hash.h \
                help.h \
                helpbase.h \
                hash.h \
                help.h \
                helpbase.h \


@@ -557,11 +560,11 @@ GTK_GENERICOBJS = \
                src/generic/colrdlgg.o \
                src/generic/dcpsg.o \
                src/generic/dirdlgg.o \
                src/generic/colrdlgg.o \
                src/generic/dcpsg.o \
                src/generic/dirdlgg.o \

+               src/generic/filedlgg.o \

                src/generic/fontdlgg.o \
                src/generic/gridg.o \
                src/generic/helphtml.o \
                src/generic/helpwxht.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 \


@@ -686,7 +689,6 @@ GTK_GUIOBJS = \
                src/gtk/dcscreen.o \
                src/gtk/dialog.o \
                src/gtk/dnd.o \
                src/gtk/dcscreen.o \
                src/gtk/dialog.o \
                src/gtk/dnd.o \

-               src/gtk/filedlg.o \

                src/gtk/font.o \
                src/gtk/frame.o \
                src/gtk/gauge.o \
                src/gtk/font.o \
                src/gtk/frame.o \
                src/gtk/gauge.o \


@@ -729,12 +731,12 @@ MOTIF_GENERICOBJS = \
                src/generic/colrdlgg.o \
                src/generic/dcpsg.o \
                src/generic/dirdlgg.o \
                src/generic/colrdlgg.o \
                src/generic/dcpsg.o \
                src/generic/dirdlgg.o \

+               src/generic/filedlgg.o \

                src/generic/fontdlgg.o \
                src/generic/gridg.o \
                src/generic/helphtml.o \
                src/generic/fontdlgg.o \
                src/generic/gridg.o \
                src/generic/helphtml.o \

-               src/generic/helpxlp.o \

                src/generic/helpwxht.o \
                src/generic/helpwxht.o \

-               src/generic/helpext.o \
+               src/generic/helpxlp.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 \


@@ -899,8 +901,6 @@ 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 \


@@ -1202,19 +1202,19 @@ REQUIRED_DIRS = ./lib ./src ./src/common ./src/gtk ./src/motif ./src/msw \
 all:    $(REQUIRED_DIRS) $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
 
 $(REQUIRED_DIRS):      $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
 all:    $(REQUIRED_DIRS) $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
 
 $(REQUIRED_DIRS):      $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h

-       @if test ! -d ./lib; then mkdir ./lib; fi
-       @if test ! -d ./src; then mkdir ./src; fi
-       @if test ! -d ./src/common; then mkdir ./src/common; fi
-       @if test ! -d ./src/msw; then mkdir ./src/msw; fi
-       @if test ! -d ./src/gtk; then mkdir ./src/gtk; fi
-       @if test ! -d ./src/motif; then mkdir ./src/motif; fi
-       @if test ! -d ./src/motif/xmcombo; then mkdir ./src/motif/xmcombo; fi
-       @if test ! -d ./src/generic; then mkdir ./src/generic; fi
-       @if test ! -d ./src/unix; then mkdir ./src/unix; fi
-       @if test ! -d ./src/html; then mkdir ./src/html; fi
-       @if test ! -d ./src/png; then mkdir ./src/png; fi
-       @if test ! -d ./src/jpeg; then mkdir ./src/jpeg; fi
-       @if test ! -d ./src/zlib; then mkdir ./src/zlib; fi
+       @mkdir -p ./lib
+       @mkdir -p ./src
+       @mkdir -p ./src/common
+       @mkdir -p ./src/msw
+       @mkdir -p ./src/gtk
+       @mkdir -p ./src/motif
+       @mkdir -p ./src/motif/xmcombo
+       @mkdir -p ./src/generic
+       @mkdir -p ./src/unix
+       @mkdir -p ./src/html
+       @mkdir -p ./src/png
+       @mkdir -p ./src/jpeg
+       @mkdir -p ./src/zlib

 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
        $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
        $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)


@@ -1222,23 +1222,23 @@ $(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@
 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
-       @if test -e ./lib/@WX_LIBRARY_LINK3@; then rm -f ./lib/@WX_LIBRARY_LINK3@; fi
+       @if test -e ./lib/@WX_LIBRARY_LINK1@; then $(RM) ./lib/@WX_LIBRARY_LINK1@; fi
+       @if test -e ./lib/@WX_LIBRARY_LINK2@; then $(RM) ./lib/@WX_LIBRARY_LINK2@; fi
+       @if test -e ./lib/@WX_LIBRARY_LINK3@; then $(RM) ./lib/@WX_LIBRARY_LINK3@; fi

        $(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@
 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
-       @if test -e $(libdir)/@WX_LIBRARY_LINK3@; then rm -f $(libdir)/@WX_LIBRARY_LINK3@; fi
+       @if test -e $(libdir)/@WX_LIBRARY_LINK1@; then $(RM) $(libdir)/@WX_LIBRARY_LINK1@; fi
+       @if test -e $(libdir)/@WX_LIBRARY_LINK2@; then $(RM) $(libdir)/@WX_LIBRARY_LINK2@; fi
+       @if test -e $(libdir)/@WX_LIBRARY_LINK3@; then $(RM) $(libdir)/@WX_LIBRARY_LINK3@; fi

        $(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,18 +1267,20 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        @echo " Installing wxWindows..."
        @echo " "
 
        @echo " Installing wxWindows..."
        @echo " "
 

+
+       $(INSTALL) -d $(prefix)

        $(INSTALL) -d $(bindir)
        $(INSTALL) -d $(libdir)
        $(INSTALL) -d $(bindir)
        $(INSTALL) -d $(libdir)

-       $(INSTALL) -d $(libdir)/wx
-       $(INSTALL) -d $(libdir)/wx/include
-       $(INSTALL) -d $(libdir)/wx/include/wx
-       $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@

 
        $(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) -d $(libdir)/wx
+       $(INSTALL) -d $(libdir)/wx/include
+       $(INSTALL) -d $(libdir)/wx/include/wx
+       $(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 $(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


@@ -1291,9 +1293,9 @@ 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:
 write_message:

-       echo " "
+       @echo " "

        @echo " The installation of wxWindows is finished.  On certain"
        @echo " platforms (e.g. Linux, Solaris) you'll now have to run"
        @echo " ldconfig if you installed a shared library."
        @echo " The installation of wxWindows is finished.  On certain"
        @echo " platforms (e.g. Linux, Solaris) you'll now have to run"
        @echo " ldconfig if you installed a shared library."


@@ -1311,16 +1313,16 @@ uninstall:
        @echo " Uninstalling wxWindows..."
        @echo " "
        @echo " Removing library..."
        @echo " Uninstalling wxWindows..."
        @echo " "
        @echo " Removing library..."

-       @rm -f $(libdir)/@WX_TARGET_LIBRARY@
-       @rm -f $(libdir)/@WX_LIBRARY_LINK1@
-       @rm -f $(libdir)/@WX_LIBRARY_LINK2@
-       @rm -f $(libdir)/@WX_LIBRARY_LINK3@
+       @$(RM) $(libdir)/@WX_TARGET_LIBRARY@
+       @$(RM) $(libdir)/@WX_LIBRARY_LINK1@
+       @$(RM) $(libdir)/@WX_LIBRARY_LINK2@
+       @$(RM) $(libdir)/@WX_LIBRARY_LINK3@

        @echo " Removing helper files..."
        @echo " Removing helper files..."

-       @rm -f $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
-       @rm -f $(bindir)/wx-config
+       @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+       @$(RM) $(bindir)/wx-config

        @echo " Removing headers..."
        @list='$(HEADERS)'; for p in $$list; do \
        @echo " Removing headers..."
        @list='$(HEADERS)'; for p in $$list; do \

-         rm -f $(includedir)/wx/$$p; \
+         $(RM) $(includedir)/wx/$$p; \

        done
        @echo " Removing directories..."
        @if test -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi
        done
        @echo " Removing directories..."
        @if test -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi


@@ -1469,22 +1471,22 @@ SAMPLES_DIST:
 
 dist: ALL_DIST @GUIDIST@ SAMPLES_DIST
        cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
 
 dist: ALL_DIST @GUIDIST@ SAMPLES_DIST
        cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..

-       rm -f -r _dist_dir
+       $(RM) -r _dist_dir

 
 clean:
 
 clean:

-       rm -f ./src/msw/*.o
-       rm -f ./src/gtk/*.o
-       rm -f ./src/motif/*.o
-       rm -f ./src/html/*.o
-       rm -f ./src/common/*.o
-       rm -f ./src/unix/*.o
-       rm -f ./src/generic/*.o
-       rm -f ./src/png/*.o
-       rm -f ./src/jpeg/*.o
-       rm -f ./src/zlib/*.o
-       rm -f *.o
-       rm -f parser.c
-       rm -f lexer.c
-       rm -f ./lib/*
+       $(RM) ./src/msw/*.o
+       $(RM) ./src/gtk/*.o
+       $(RM) ./src/motif/*.o
+       $(RM) ./src/html/*.o
+       $(RM) ./src/common/*.o
+       $(RM) ./src/unix/*.o
+       $(RM) ./src/generic/*.o
+       $(RM) ./src/png/*.o
+       $(RM) ./src/jpeg/*.o
+       $(RM) ./src/zlib/*.o
+       $(RM) *.o
+       $(RM) parser.c
+       $(RM) lexer.c
+       $(RM) ./lib/*

 
 cleanall: clean
 
 cleanall: clean