X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27ea1d8aae3055025b2ebac9d9f7e93feee7569d..6c5e63761c870ea4918a3fe049f99fce6707b938:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index df0f028274..b5502050b0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 
 #
-# 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!
 
 #
@@ -66,7 +66,10 @@ top_builddir = .
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+# 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 = :
@@ -174,6 +177,7 @@ WX_HEADERS = \
 		gdicmn.h \
 		gdiobj.h \
 		grid.h \
+		gsocket.h \
 		hash.h \
 		help.h \
 		helpbase.h \
@@ -556,8 +560,11 @@ GTK_GENERICOBJS = \
 		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/imaglist.o \
 		src/generic/laywin.o \
 		src/generic/listctrl.o \
@@ -682,7 +689,6 @@ GTK_GUIOBJS = \
 		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 \
@@ -725,8 +731,11 @@ MOTIF_GENERICOBJS = \
 		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/helpxlp.o \
 		src/generic/imaglist.o \
 		src/generic/laywin.o \
@@ -1193,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
-	@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)
@@ -1215,17 +1224,17 @@ $(REQUIRED_DIRS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDI
 	$(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
-	@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@
 	
 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@
@@ -1258,23 +1267,28 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
 	@echo " Installing wxWindows..."
 	@echo " "
 
+
+	$(INSTALL) -d $(prefix)
+	$(INSTALL) -d $(bindir)
+	$(INSTALL) -d $(libdir)
+
 	$(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
 	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
-	
-	@if test ! -d $(libdir)/wx; then mkdir $(libdir)/wx; fi
-	@if test ! -d $(libdir)/wx/include; then mkdir $(libdir)/wx/include; fi
-	@if test ! -d $(libdir)/wx/include/wx; then mkdir $(libdir)/wx/include/wx; fi
-	@if test ! -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then mkdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi
+
+	$(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
 	
-	@if test ! -d $(includedir)/wx; then mkdir $(includedir)/wx; fi
-	@if test ! -d $(includedir)/wx/msw; then mkdir $(includedir)/wx/msw; fi
-	@if test ! -d $(includedir)/wx/gtk; then mkdir $(includedir)/wx/gtk; fi
-	@if test ! -d $(includedir)/wx/motif; then mkdir $(includedir)/wx/motif; fi
-	@if test ! -d $(includedir)/wx/html; then mkdir $(includedir)/wx/html; fi
-	@if test ! -d $(includedir)/wx/protocol; then mkdir $(includedir)/wx/protocol; fi
-	@if test ! -d $(includedir)/wx/unix; then mkdir $(includedir)/wx/unix; fi
-	@if test ! -d $(includedir)/wx/generic; then mkdir $(includedir)/wx/generic; fi
+	$(INSTALL) -d $(includedir)/wx
+	$(INSTALL) -d $(includedir)/wx/msw
+	$(INSTALL) -d $(includedir)/wx/gtk
+	$(INSTALL) -d $(includedir)/wx/motif
+	$(INSTALL) -d $(includedir)/wx/html
+	$(INSTALL) -d $(includedir)/wx/protocol
+	$(INSTALL) -d $(includedir)/wx/unix
+	$(INSTALL) -d $(includedir)/wx/generic
 	@list='$(HEADERS)'; for p in $$list; do \
 	  $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
 	  echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
@@ -1299,16 +1313,16 @@ uninstall:
 	@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..."
-	@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 \
-	  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
@@ -1457,22 +1471,22 @@ SAMPLES_DIST:
 
 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:
-	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