Index: trunk/src/DPlayX/makefile
===================================================================
--- trunk/src/DPlayX/makefile	(revision 2707)
+++ trunk/src/DPlayX/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.5 2000-02-05 01:58:08 sandervl Exp $
+# $Id: makefile,v 1.6 2000-02-09 23:40:41 bird Exp $
 
 #
@@ -28,33 +28,41 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/advapi32.lib \
-              OS2386.LIB $(RTLLIB_O) \
-              $(PDWIN32_LIB)/ole32.lib $(PDWIN32_LIB)/msvfw32.lib
-        $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/advapi32.lib \
+          OS2386.LIB $(RTLLIB_O) \
+          $(PDWIN32_LIB)/ole32.lib $(PDWIN32_LIB)/msvfw32.lib
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-	$(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-	$(CP) $@ $(PDWIN32_LIB)
+        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+        $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
+
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-dplayx.obj:   dplayx.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-        $(RM) *.obj *.lib *.dll *~ *.map *.pch
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *~ *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
-
-
-
-
Index: trunk/src/NTDLL/makefile
===================================================================
--- trunk/src/NTDLL/makefile	(revision 2707)
+++ trunk/src/NTDLL/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.18 2000-02-05 02:05:00 sandervl Exp $
+# $Id: makefile,v 1.19 2000-02-09 23:40:41 bird Exp $
 
 #
@@ -43,56 +43,37 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) sbsstub.obj $(TARGET).def $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)\user32.lib $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/crtdll.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-        $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) sbsstub.obj $(TARGET).def $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)\user32.lib $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/crtdll.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
-$(TARGET).LIB: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
+$(TARGET).lib: $(TARGET)exp.def
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
+
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-ntdll.obj:  .\ntdll.cpp  .\ntdll.h
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-file.obj:   .\file.cpp   .\ntdll.h
+!ifndef NODEP
+!include .depend
+!endif
 
-nt.obj:     .\nt.cpp     .\ntdll.h
-
-om.obj:     .\om.cpp     .\ntdll.h
-
-reg.obj:    .\reg.cpp    .\ntdll.h
-
-rtl.obj:    .\rtl.cpp    .\ntdll.h
-
-rtlstr.obj: .\rtlstr.cpp .\ntdll.h
-
-sec.obj:    .\sec.cpp    .\ntdll.h
-
-sync.obj:   .\sync.cpp   .\ntdll.h
-
-time.obj:   .\time.cpp   .\ntdll.h
-
-initterm.obj: .\initterm.cpp
-
-crt.obj:    .\crt.cpp    .\ntdll.h
-
-unknown.obj: .\unknown.cpp .\ntdll.h
-
-exception.obj: .\exception.cpp .\ntdll.h
-
-arith64.obj: .\arith64.asm
-
-regfunc.obj: .\regfunc.asm
-
-qsort.obj: qsort.c
 
 clean:
-        $(RM) *.obj *.lib *.dll *.map *.pch
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_LIB)\$(TARGET).lib $(PDWIN32_BIN)\$(TARGET).dll \
+        resource.asm $(TARGET)exp.def
 
Index: trunk/src/advapi32/makefile
===================================================================
--- trunk/src/advapi32/makefile	(revision 2707)
+++ trunk/src/advapi32/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.19 2000-02-05 01:51:39 sandervl Exp $
+# $Id: makefile,v 1.20 2000-02-09 23:40:41 bird Exp $
 
 #
@@ -28,32 +28,39 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/ntdll.lib \
-              $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/pmwinx.lib OS2386.LIB $(RTLLIB_O)
-        $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/ntdll.lib \
+          $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/pmwinx.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
     $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
+
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-advapi32.obj: advapi32.cpp advapi32.h $(PDWIN32_INCLUDE)\odinwrap.h
-registry.obj: registry.cpp $(PDWIN32_INCLUDE)\odinwrap.h
-lsa.obj:      lsa.cpp $(PDWIN32_INCLUDE)\odinwrap.h
-service.obj:  service.cpp
-crypt.obj:  crypt.cpp
-eventlog.obj:  eventlog.cpp
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch
-    $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-    $(RM) $(PDWIN32_LIB)\$(TARGET).lib
-    $(RM) $(TARGET)exp.def
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll  \
+        $(PDWIN32_LIB)\$(TARGET).lib  \
+        $(TARGET)exp.def resource.asm
+
Index: trunk/src/avifil32/makefile
===================================================================
--- trunk/src/avifil32/makefile	(revision 2707)
+++ trunk/src/avifil32/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.5 2000-02-05 01:52:22 sandervl Exp $
+# $Id: makefile,v 1.6 2000-02-09 23:40:42 bird Exp $
 
 #
@@ -27,32 +27,39 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
-              $(PDWIN32_LIB)/ole32.lib $(PDWIN32_LIB)/msvfw32.lib 
-        $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
+          $(PDWIN32_LIB)/ole32.lib $(PDWIN32_LIB)/msvfw32.lib
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-avifile.obj:  avifile.cpp
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-        $(RM) *.obj *.lib *.dll *.map *.pch
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm  $(TARGET)exp.def
 
-
-
-
-
Index: trunk/src/capi2032/makefile
===================================================================
--- trunk/src/capi2032/makefile	(revision 2707)
+++ trunk/src/capi2032/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.9 2000-02-05 01:53:05 sandervl Exp $
+# $Id: makefile,v 1.10 2000-02-09 23:40:42 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	capi2032.dll makefile
+#       capi2032.dll makefile
 #
 
@@ -29,30 +29,40 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib \
-              OS2386.LIB $(RTLLIB_O) 
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib \
+          OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-	$(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-	$(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-capi2032.obj: capi2032.cpp capi2032.h
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *~ *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *~ *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
-
-
Index: trunk/src/comctl32/makefile
===================================================================
--- trunk/src/comctl32/makefile	(revision 2707)
+++ trunk/src/comctl32/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.19 2000-02-05 01:53:54 sandervl Exp $
+# $Id: makefile,v 1.20 2000-02-09 23:40:42 bird Exp $
 #
 # PD-Win32 API
@@ -28,57 +28,44 @@
 all: $(TARGET).dll $(TARGET).lib
 
+
+$(TARGET).dll: $(OBJS) $(TARGET).def
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/gdi32.lib \
+          $(PDWIN32_LIB)/user32.lib  $(PDWIN32_LIB)/odincrt.lib \
+          OS2386.LIB  $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
+
+
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
+$(TARGET).lib: $(TARGET)exp.def
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
+
+$(TARGET)exp.def: $(TARGET).def
+    $(IMPDEF) $** $@
+
+
 resource.asm: rsrc.rc
     $(RC) $(RCFLAGS) -o resource.asm rsrc.rc
 
-resource.obj: resource.asm
+
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/gdi32.lib \
-              $(PDWIN32_LIB)/user32.lib  $(PDWIN32_LIB)/odincrt.lib \
-              OS2386.LIB  $(RTLLIB_O)
-        $(CP) $@ $(PDWIN32_BIN)
+clean:
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        $(PDWIN32_LIB)\$(TARGET).lib \
+        $(TARGET)exp.def
 
-
-$(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
-
-comctl32.obj: comctl32.c
-initterm.obj: initterm.cpp
-progress.obj: progress.c
-comctl32undoc.obj: comctl32undoc.c
-imagelist.obj: imagelist.c
-comboex.obj: comboex.c
-animate.obj: animate.c
-datetime.obj: datetime.c
-flatsb.obj: flatsb.c
-hotkey.obj: hotkey.c
-ipaddress.obj: ipaddress.c
-monthcal.obj: monthcal.c
-nativefont.obj: nativefont.c
-pager.obj: pager.c
-tab.obj: tab.c
-status.obj: status.c
-header.obj: header.c
-updown.obj: updown.c
-rebar.obj: rebar.c
-cache.obj: cache.c
-trackbar.obj: trackbar.c
-tooltips.obj: tooltips.c
-toolbar.obj: toolbar.c
-treeview.obj: treeview.c
-propsheet.obj: propsheet.c
-listview.obj: listview.c
-draglist.obj: draglist.c
-
-clean:
-        $(RM) *.obj *.lib *.dll *.map *.pch
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
-
Index: trunk/src/comdlg32/makefile
===================================================================
--- trunk/src/comdlg32/makefile	(revision 2707)
+++ trunk/src/comdlg32/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.13 2000-02-05 01:54:33 sandervl Exp $
+# $Id: makefile,v 1.14 2000-02-09 23:40:42 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	comdlg32.dll makefile
+#       comdlg32.dll makefile
 #
 
@@ -28,36 +28,38 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/shlwapi.lib \
-              $(PDWIN32_LIB)/shell32.lib $(PDWIN32_LIB)/gdi32.lib OS2386.LIB $(RTLLIB_O)
-        $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/shlwapi.lib \
+          $(PDWIN32_LIB)/shell32.lib $(PDWIN32_LIB)/gdi32.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-	$(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-	$(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
-resource.asm: rsrc.rc 
-    $(RC) $(RCFLAGS) -o resource.asm rsrc.rc 
+resource.asm: rsrc.rc
+    $(RC) $(RCFLAGS) -o resource.asm rsrc.rc
 
-resource.obj: resource.asm
 
-comdlg32.obj: comdlg32.cpp $(PDWIN32_INCLUDE)\win32wnd.h
-initterm.obj: initterm.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-cdlg32.obj: cdlg32.cpp cdlg.h
-finddlg32.obj: finddlg32.cpp cdlg.h
-filedlg95.obj: filedlg95.c filedlgbrowser.h cdlg.h
-filedlgbrowser.obj: filedlgbrowser.c filedlgbrowser.h cdlg.h
-filetitle.obj: filetitle.c cdlg.h
-comdlgguid.obj: comdlgguid.cpp
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch	
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
-
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
Index: trunk/src/crtdll/makefile
===================================================================
--- trunk/src/crtdll/makefile	(revision 2707)
+++ trunk/src/crtdll/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.7 2000-02-05 01:55:11 sandervl Exp $
+# $Id: makefile,v 1.8 2000-02-09 23:40:43 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	crtdll.dll makefile
+#       crtdll.dll makefile
 #
 
@@ -16,5 +16,5 @@
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE) 
+CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
 
@@ -23,5 +23,5 @@
 
 OBJS =  crtdll.obj asmhlp.obj stubs.obj internal.obj crt_string.obj \
-	crt_memory.obj crt_mb.obj crt_wc.obj initterm.obj resource.obj
+        crt_memory.obj crt_mb.obj crt_wc.obj initterm.obj resource.obj
 
 all: $(TARGET).dll $(TARGET).lib
@@ -29,40 +29,37 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
-	       $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/user32.lib OS2386.LIB $(RTLLIB_O) 
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/user32.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
-$(TARGET).LIB: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
+$(TARGET).lib: $(TARGET)exp.def
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-initterm.obj:	initterm.cpp $(PDWIN32_INCLUDE)\exitlist.h
-asmhlp.obj: 	asmhlp.asm
-stubs.obj:	stubs.cpp
-internal.obj:	internal.cpp
-crt_string.obj:	crt_string.cpp
-crt_mb.obj:	crt_mb.cpp
-crt_memory.obj:	crt_memory.cpp
-crt_wc.obj:	crt_wc.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-crtdll.obj:	crtdll.cpp
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
-
-
-
-
-
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
Index: trunk/src/ddraw/makefile
===================================================================
--- trunk/src/ddraw/makefile	(revision 2707)
+++ trunk/src/ddraw/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.20 2000-02-09 15:55:56 sandervl Exp $
+# $Id: makefile,v 1.21 2000-02-09 23:40:43 bird Exp $
 #
 # ddraw.dll makefile
@@ -38,86 +38,38 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def $(LIBS)
-  $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def $(LIBS)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-  $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-  $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-  $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
-
-ddraw.obj: ddraw.cpp  \
-    os2ddraw.h        \
-    $(PDWIN32_INCLUDE)\win\ddraw.h
-
-os2ddraw.obj: os2ddraw.cpp  \
-    os2palette.h \
-    os2clipper.h \
-    os2surface.h \
-    os2ddraw.h\
-    $(PDWIN32_INCLUDE)\win\ddraw.h \
-    $(PDWIN32_INCLUDE)\win\d3d.h
-
-os2d3d.obj: os2d3d.cpp \
-    os2ddraw.h\
-    $(PDWIN32_INCLUDE)\win\ddraw.h \
-    $(PDWIN32_INCLUDE)\win\d3d.h
-
-os2palette.obj: os2palette.cpp  \
-    os2palette.h \
-    os2clipper.h \
-    os2surface.h \
-    os2palset.h \
-    os2ddraw.h
-
-os2palset.obj: os2palset.cpp  \
-    os2palset.h
-
-os2clipper.obj: os2clipper.cpp  \
-    os2palette.h \
-    os2clipper.h \
-    os2surface.h \
-    os2ddraw.h\
-    $(PDWIN32_INCLUDE)\win\ddraw.h \
-    $(PDWIN32_INCLUDE)\win\d3d.h
-
-os2surface.obj: os2surface.cpp  \
-    os2palette.h \
-    os2clipper.h \
-    os2surface.h \
-    os2ddraw.h\
-    rectangle.h \
-    $(PDWIN32_INCLUDE)\win\ddraw.h \
-    $(PDWIN32_INCLUDE)\win\d3d.h
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-rectangle.obj: rectangle.cpp rectangle.h
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-initterm.obj: initterm.cpp initterm.h $(PDWIN32_INCLUDE)\exitlist.h
+!ifndef NODEP
+!include .depend
+!endif
 
-os2util.obj:  os2util.cpp os2util.h
-
-bltFunc.obj: bltFunc.cpp bltFunc.h \
-    $(PDWIN32_INCLUDE)\misc.h
-
-fillfunc.obj: fillfunc.cpp fillfunc.h \
-    $(PDWIN32_INCLUDE)\misc.h
-
-colorconv.obj: colorconv.cpp colorconv.h \
-    $(PDWIN32_INCLUDE)\misc.h
-
-iccio1.obj: iccio1.asm
-
-asmutil.obj: asmutil.asm
 
 clean:
-  $(RM) *.obj *.lib *.dll *.map *.pch
-  $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-  $(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
+
Index: trunk/src/dinput/makefile
===================================================================
--- trunk/src/dinput/makefile	(revision 2707)
+++ trunk/src/dinput/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.3 2000-02-05 01:56:38 sandervl Exp $
+# $Id: makefile,v 1.4 2000-02-09 23:40:43 bird Exp $
 
 #
@@ -28,35 +28,41 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
-              $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/ole32.lib 
-        $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
+          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/ole32.lib
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
+
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
+
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
 
 
-dinput.obj:   dinput.cpp oslibinput.h
-oslibinput.obj: oslibinput.cpp oslibinput.h $(PDWIN32_INCLUDE)\winkeyboard.h
-dinputguid.obj: dinputguid.cpp
+clean:
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        $(PDWIN32_LIB)\$(TARGET).lib \
+        $(TARGET)exp.def resource.asm
 
-clean:
-        $(RM) *.obj *.lib *.dll *.map *.pch
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
-
-
-
-
-
Index: trunk/src/dllentry/makefile
===================================================================
--- trunk/src/dllentry/makefile	(revision 2707)
+++ trunk/src/dllentry/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.1 2000-02-05 01:49:48 sandervl Exp $
+# $Id: makefile,v 1.2 2000-02-09 23:40:44 bird Exp $
 
 #
@@ -24,14 +24,18 @@
 
 $(PDWIN32_LIB)\$(TARGET).obj: dllentry.obj
-        $(CP) $(TARGET).obj $(PDWIN32_LIB)
+    $(CP) $(TARGET).obj $(PDWIN32_LIB)
 
-$(TARGET).obj: dllentry.cpp
+lib: $(PDWIN32_LIB)\$(TARGET).obj
+
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-        $(RM) *.obj
-        $(RM) $(PDWIN32_LIB)\$(TARGET).obj
+    $(RM) *.obj $(PDWIN32_LIB)\$(TARGET).obj *.pch
 
-
-
-
-
Index: trunk/src/dplay/makefile
===================================================================
--- trunk/src/dplay/makefile	(revision 2707)
+++ trunk/src/dplay/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.4 2000-02-05 01:57:31 sandervl Exp $
+# $Id: makefile,v 1.5 2000-02-09 23:40:44 bird Exp $
 
 #
@@ -28,32 +28,40 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
-              $(PDWIN32_LIB)/ole32.lib $(PDWIN32_LIB)/advapi32.lib 
-        $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
+          $(PDWIN32_LIB)/ole32.lib $(PDWIN32_LIB)/advapi32.lib
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-dplay.obj:    dplay.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-        $(RM) *.obj *.lib *.dll *~ *.map *.pch
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *~ *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
-
-
-
-
Index: trunk/src/dsound/makefile
===================================================================
--- trunk/src/dsound/makefile	(revision 2707)
+++ trunk/src/dsound/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.14 2000-02-05 01:58:50 sandervl Exp $
+# $Id: makefile,v 1.15 2000-02-09 23:40:44 bird Exp $
 
 #
@@ -28,43 +28,35 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-        $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET).def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
+    $(CP) $@ $(PDWIN32_LIB)
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-dsound.obj: dsound.cpp \
-    $(PDWIN32_INCLUDE)/misc.h \
-    os2dsound.h
-
-os2dsound.obj: os2dsound.cpp \
-    $(PDWIN32_INCLUDE)/misc.h \
-    os2sndbuffer.h \
-    os2dsound.h
-
-os2sndbuffer.obj: os2sndbuffer.cpp \
-    $(PDWIN32_INCLUDE)/misc.h \
-    os2sndbuffer.h \
-    os2dsound.h
-
-os2helper.obj: os2helper.cpp\
-    $(PDWIN32_INCLUDE)/os2wrap.h
-
-initterm.obj: initterm.cpp initterm.h
+!ifndef NODEP
+!include .depend
+!endif
 
 
 clean:
-        $(RM) *.obj *.lib *.dll *.map *.pch
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
Index: trunk/src/gdi32/makefile
===================================================================
--- trunk/src/gdi32/makefile	(revision 2707)
+++ trunk/src/gdi32/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.19 2000-02-05 01:59:25 sandervl Exp $
+# $Id: makefile,v 1.20 2000-02-09 23:40:45 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	gdi32.dll makefile
+#       gdi32.dll makefile
 #
 
@@ -21,7 +21,7 @@
 TARGET = gdi32
 
-OBJS =	gdi32.obj opengl.obj callback.obj dibsect.obj initterm.obj resource.obj \
-	oslibgdi.obj font.obj text.obj palette.obj line.obj oslibgpi.obj region.obj \
-	metafile.obj dibitmap.obj blit.obj rgbcvt.obj
+OBJS =  gdi32.obj opengl.obj callback.obj dibsect.obj initterm.obj resource.obj \
+        oslibgdi.obj font.obj text.obj palette.obj line.obj oslibgpi.obj region.obj \
+        metafile.obj dibitmap.obj blit.obj rgbcvt.obj
 
 
@@ -30,70 +30,39 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-	      $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/user32.lib \
-	      $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/user32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-	$(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-	$(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
     $(IMPDEF) $** $@
 
+
 resource.asm: gdi32.rc
     $(RC) $(RCFLAGS) -o resource.asm gdi32.rc
 
-resource.obj: resource.asm
 
-rgbcvt.obj: rgbcvt.asm
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-gdi32.obj: gdi32.cpp \
-    callback.h \
-    dibsect.h \
-    $(PDWIN32_INCLUDE)\misc.h \
-
-region.obj: region.cpp $(PDWIN32_INCLUDE)\misc.h
-
-metafile.obj: metafile.cpp $(PDWIN32_INCLUDE)\misc.h
-
-dibitmap.obj: dibitmap.cpp dibsect.h $(PDWIN32_INCLUDE)\misc.h
-blit.obj: blit.cpp dibsect.h $(PDWIN32_INCLUDE)\misc.h rgbcvt.h
-
-font.obj: font.cpp \
-    $(PDWIN32_INCLUDE)\misc.h \
-
-text.obj: text.cpp \
-    $(PDWIN32_INCLUDE)\misc.h \
-
-palette.obj: palette.cpp \
-    $(PDWIN32_INCLUDE)\misc.h dibsect.h \
-
-dibsect.obj: dibsect.cpp \
-    dibsect.h \
-    $(PDWIN32_INCLUDE)\misc.h \
-
-opengl.obj: opengl.cpp \
-    $(PDWIN32_INCLUDE)\misc.h \
-
-callback.obj: callback.cpp \
-    callback.h \
-    $(PDWIN32_INCLUDE)\misc.h \
-
-oslibgdi.obj: oslibgdi.cpp oslibgdi.h
-
-line.obj: line.cpp \
-    $(PDWIN32_INCLUDE)\misc.h \
-
-oslibgpi.obj: oslibgpi.cpp oslibgpi.h
-
-initterm.obj: initterm.cpp
+!ifndef NODEP
+!include .depend
+!endif
 
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch resource.asm
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
-    $(RM) $(TARGET)exp.def
+    $(RM) *.obj *.lib *.dll *.map *.pch resource.asm \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        $(TARGET)exp.def
 
Index: trunk/src/imagehlp/makefile
===================================================================
--- trunk/src/imagehlp/makefile	(revision 2707)
+++ trunk/src/imagehlp/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.6 2000-02-05 02:00:05 sandervl Exp $
+# $Id: makefile,v 1.7 2000-02-09 23:40:45 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	imagehlp.dll makefile
+#       imagehlp.dll makefile
 #
 
@@ -28,33 +28,39 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
+
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-initterm.obj: initterm.cpp
-imagehlp.obj: imagehlp.cpp
-internal.obj: internal.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+         resource.asm $(TARGET)exp.def
 
-
-
-
-
Index: trunk/src/imm32/makefile
===================================================================
--- trunk/src/imm32/makefile	(revision 2707)
+++ trunk/src/imm32/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.6 2000-02-05 02:00:41 sandervl Exp $
+# $Id: makefile,v 1.7 2000-02-09 23:40:45 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	imm32.dll makefile
+#       imm32.dll makefile
 #
 
@@ -28,28 +28,39 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) 
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-imm32.obj: imm32.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
 
Index: trunk/src/kernel32/makefile
===================================================================
--- trunk/src/kernel32/makefile	(revision 2707)
+++ trunk/src/kernel32/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.81 2000-02-05 02:01:04 sandervl Exp $
+# $Id: makefile,v 1.82 2000-02-09 23:40:46 bird Exp $
 
 #
@@ -48,5 +48,5 @@
 cvtaccel.obj cvticon.obj cvticongrp.obj oslibexcept.obj cpu.obj process.obj \
 cvtcursor.obj cvtcursorgrp.obj stubs.obj interlock.obj toolhelp.obj codepage.obj \
-debug.obj oslibdebug.obj 
+debug.obj oslibdebug.obj
 
 
@@ -57,17 +57,18 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def $(TARGET).lrf
-#        $(LD) $(LDFLAGS) /Fm /Fe$@ /B"/FREE" @$(TARGET).lrf
+#   $(LD) $(LDFLAGS) /Fm /Fe$@ /B"/FREE" @$(TARGET).lrf
 !ifdef DEBUG
 !ifdef NODEBUGINFO
-	ilink /nodeb /map /noe /NOD /NoLogo /NOFREE @$(TARGET).lrf
+    ilink /nodeb /map /noe /NOD /NoLogo /NOFREE @$(TARGET).lrf
 !else
-	ilink /de /map  /noe /NOD /dbgpack /NoLogo /NOFREE @$(TARGET).lrf
+    ilink /de /map  /noe /NOD /dbgpack /NoLogo /NOFREE @$(TARGET).lrf
 !endif
 !else
-	ilink /map  /noe /NOD /NoLogo /FREE @$(TARGET).lrf
+    ilink /map  /noe /NOD /NoLogo /NOFREE @$(TARGET).lrf
 !endif
-        rc -r console.rc console.res
-        rc console.res $@
-        $(CP) $@ $(PDWIN32_BIN)
+    rc -r console.rc console.res
+    rc console.res $@
+    $(CP) $@ $(PDWIN32_BIN)
+
 
 $(TARGET).lrf: makefile
@@ -83,340 +84,35 @@
 <<keep
 
+
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).LIB: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
+
 
 $(PDWIN32_LIB)\pmwinx.lib:
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(PDWIN32_LIB)\pmwinx.def
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(PDWIN32_LIB)\pmwinx.def
 
 kernelrsrc.asm: kernel32.rc
     $(RC) $(RCFLAGS) -o kernelrsrc.asm kernel32.rc
 
-kernelrsrc.obj: kernelrsrc.asm
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-kernel32.OBJ: kernel32.cpp \
-    exceptutil.h \
-    $(PDWIN32_INCLUDE)\unicode.h \
-    $(PDWIN32_INCLUDE)\heap.h \
-    $(PDWIN32_INCLUDE)\versionos2.h \
-    $(PDWIN32_INCLUDE)\wprocess.h
-
-process.obj: process.cpp \
-    $(PDWIN32_INCLUDE)\misc.h \
-    oslibdos.h \
-    $(PDWIN32_INCLUDE)\winimagebase.h \
-    $(PDWIN32_INCLUDE)\wprocess.h
-
-kobjects.obj: kobjects.cpp
-
-comm.OBJ: \
-    .\comm.cpp \
-    $(PDWIN32_INCLUDE)\unicode.h
-
-profile.obj: profile.cpp \
-    $(PDWIN32_INCLUDE)\unicode.h
-
-directory.obj: directory.cpp \
-    $(PDWIN32_INCLUDE)\unicode.h \
-    initterm.h directory.h oslibdos.h profile.h
-
-disk.obj: disk.cpp \
-    $(PDWIN32_INCLUDE)\unicode.h
-
-atom.obj: atom.cpp \
-    $(PDWIN32_INCLUDE)\unicode.h
-
-time.obj: time.cpp \
-    $(PDWIN32_INCLUDE)\unicode.h
-
-wintls.obj: wintls.cpp $(PDWIN32_INCLUDE)\winimagebase.h $(PDWIN32_INCLUDE)\winexebase.h $(PDWIN32_INCLUDE)\windllbase.h
-
-fileio.obj: fileio.cpp \
-    $(PDWIN32_INCLUDE)\unicode.h
-
-thread.OBJ: \
-    .\thread.cpp \
-    $(PDWIN32_INCLUDE)\wprocess.h \
-    $(PDWIN32_INCLUDE)\winimagebase.h $(PDWIN32_INCLUDE)\winexebase.h $(PDWIN32_INCLUDE)\windllbase.h \
-    oslibmisc.h thread.h
-
-heap.OBJ: \
-    .\heap.cpp \
-    $(PDWIN32_INCLUDE)\heap.h \
-    os2heap.h
-
-heapstring.obj: \
-    .\heapstring.cpp \
-    $(PDWIN32_INCLUDE)\heap.h \
-    $(PDWIN32_INCLUDE)\heapstring.h
-
-os2heap.OBJ: \
-    .\os2heap.cpp \
-    $(PDWIN32_INCLUDE)\vmutex.h \
-    $(PDWIN32_INCLUDE)\win32type.h \
-    os2heap.h \
-    initterm.h
-
-initterm.OBJ: .\initterm.cpp initterm.h  $(PDWIN32_INCLUDE)\heapshared.h  mmap.h directory.h hmdevio.h initsystem.h $(PDWIN32_INCLUDE)\heapcode.h $(PDWIN32_INCLUDE)\exitlist.h
-initsystem.obj: initsystem.cpp $(PDWIN32_INCLUDE)\cpuhlp.h initsystem.h $(PDWIN32_INCLUDE)\misc.h directory.h $(PDWIN32_INCLUDE)\versionos2.h
+!ifndef NODEP
+!include .depend
+!endif
 
 
-thunk.OBJ: \
-    .\thunk.cpp \
-    thunk.h
-
-vmutex.OBJ: vmutex.cpp \
-    $(PDWIN32_INCLUDE)\vmutex.h
-
-exceptions.OBJ: \
-    .\exceptions.cpp \
-    oslibexcept.h \
-    mmap.h \
-    $(PDWIN32_INCLUDE)\exceptions.h \
-    exceptutil.h
-
-message.OBJ: \
-    .\message.cpp \
-    $(PDWIN32_INCLUDE)\unicode.h
-
-oslibexcept.obj: \
-    oslibexcept.cpp \
-    $(PDWIN32_INCLUDE)\exceptions.h \
-    oslibexcept.h
-
-hmdevio.OBJ: \
-    .\hmdevice.h \
-    .\hmdevio.cpp \
-    exceptutil.h \
-    hmdevio.h \
-    map.h \
-    cio.h
-
-LANG.OBJ: \
-    .\lang.cpp
-
-wprocess.OBJ: \
-    .\wprocess.cpp \
-    $(PDWIN32_INCLUDE)\unicode.h \
-    $(PDWIN32_INCLUDE)\winexebase.h \
-    $(PDWIN32_INCLUDE)\windllbase.h \
-    $(PDWIN32_INCLUDE)\winexepeldr.h \
-    $(PDWIN32_INCLUDE)\windllpeldr.h \
-    $(PDWIN32_INCLUDE)\winimagebase.h \
-    $(PDWIN32_INCLUDE)\winfakepeldr.h \
-    $(PDWIN32_INCLUDE)\winimagepeldr.h \
-    $(PDWIN32_INCLUDE)\versionos2.h \
-    $(PDWIN32_INCLUDE)\wprocess.h \
-    $(PDWIN32_INCLUDE)\win\thread.h \
-    oslibdebug.h \
-    console2.h \
-    mmap.h \
-    cio.h \
-    oslibmisc.h
-
-map.OBJ: \
-    .\map.cpp \
-    map.h \
-    mapos2.h
-
-oslibdos.OBJ: \
-    .\oslibdos.cpp oslibdos.h initterm.h
-
-network.OBJ: \
-    .\network.cpp \
-    $(PDWIN32_INCLUDE)\unicode.h
-
-misc.OBJ: \
-    .\misc.cpp \
-    initterm.h \
-    $(PDWIN32_INCLUDE)\misc.h \
-    $(PDWIN32_INCLUDE)\win\thread.h
-
-win32util.OBJ: \
-    .\win32util.cpp \
-    $(PDWIN32_INCLUDE)\win32util.h
-
-unicode.OBJ: \
-    .\unicode.cpp \
-    $(PDWIN32_INCLUDE)\unicode.h \
-    $(PDWIN32_INCLUDE)\misc.h
-
-console.OBJ: \
-    .\console.cpp \
-    .\console2.h \
-    $(PDWIN32_INCLUDE)\misc.h
-
-conin.OBJ: \
-    .\conin.h \
-    .\hmdevice.h \
-    .\conin.cpp
-
-conout.OBJ: \
-    .\conout.h \
-    .\hmdevice.h \
-    .\conout.cpp
-
-conbuffer.OBJ: \
-    .\conbuffer.h \
-    .\hmdevice.h \
-    .\conbuffer.cpp
-
-lfile.OBJ: \
-    .\lfile.cpp \
-    $(PDWIN32_INCLUDE)\wprocess.h
-
-obsolete.OBJ: \
-    .\obsolete.cpp
-
-resource.OBJ: \
-    .\resource.cpp \
-    $(PDWIN32_INCLUDE)\unicode.h \
-    $(PDWIN32_INCLUDE)\winimagebase.h \
-    $(PDWIN32_INCLUDE)\winres.h \
-    $(PDWIN32_INCLUDE)\misc.h
-
-exceptutil.OBJ: \
-    .\exceptutil.asm
-
-iccio.OBJ: \
-    .\iccio.asm
-
-winres.OBJ: \
-    .\winres.cpp \
-    cvtresource.h \
-    $(PDWIN32_INCLUDE)\winres.h \
-    $(PDWIN32_INCLUDE)\winimagebase.h \
-    $(PDWIN32_INCLUDE)\winexebase.h \
-    $(PDWIN32_INCLUDE)\windllbase.h \
-    $(PDWIN32_INCLUDE)\misc.h
-
-oslibmisc.OBJ: .\oslibmisc.cpp oslibmisc.h
-
-handlemanager.OBJ: \
-        .\handlemanager.cpp \
-        .\hmevent.h \
-        .\hmmutex.h \
-        .\hmopen32.h \
-        .\hmsemaphore.h \
-        .\hmmmap.h \
-	.\hmtoken.h \
-        $(PDWIN32_INCLUDE)\winconst.h \
-        $(PDWIN32_INCLUDE)\handlemanager.h
-
-hmtoken.obj: hmtoken.cpp \
-	.\hmtoken.h \
-        .\hmdevice.h \
-        $(PDWIN32_INCLUDE)\handlemanager.h
-
-hmcomm.obj: \
-        .\hmcomm.cpp \
-        .\hmdevice.h \
-        .\hmcomm.h \
-        $(PDWIN32_INCLUDE)\handlemanager.h
-
-hmdevice.OBJ: \
-        .\hmdevice.cpp \
-        .\hmdevice.h \
-        $(PDWIN32_INCLUDE)\handlemanager.h
-
-hmopen32.OBJ: \
-        .\hmopen32.cpp \
-        .\hmdevice.h \
-        .\hmopen32.h \
-        $(PDWIN32_INCLUDE)\handlemanager.h
-
-hmobjects.obj: \
-        .\hmobjects.cpp \
-        .\hmdevice.h \
-        .\hmobjects.h \
-        $(PDWIN32_INCLUDE)\handlemanager.h
-
-hmevent.obj: \
-        .\hmevent.cpp \
-        .\hmevent.h \
-        .\hmdevice.h \
-        .\hmopen32.h
-
-hmmutex.obj: \
-        .\hmmutex.cpp \
-        .\hmmutex.h \
-        .\hmdevice.h \
-        .\hmopen32.h
-
-hmsemaphore.obj: \
-        .\hmsemaphore.cpp \
-        .\hmsemaphore.h \
-        .\hmdevice.h \
-        .\hmopen32.h
-
-hmmmap.obj: hmmmap.cpp hmdevice.h hmopen32.h mmap.h $(PDWIN32_INCLUDE)\heapshared.h
-
-conprop.OBJ: \
-        .\conprop.h \
-        .\conprop.cpp
-
-conprop2.OBJ: \
-        .\conprop.h \
-        .\conprop2.cpp
-
-async.OBJ: \
-        .\async.cpp \
-        $(PDWIN32_INCLUDE)\win32type.h \
-        $(PDWIN32_INCLUDE)\misc.h \
-        $(PDWIN32_INCLUDE)\unicode.h
-
-virtual.obj:   virtual.cpp $(PDWIN32_INCLUDE)\win\virtual.h $(PDWIN32_INCLUDE)\handlemanager.h mmap.h
-mmap.obj:      mmap.cpp mmap.h $(PDWIN32_INCLUDE)\vmutex.h oslibdos.h $(PDWIN32_INCLUDE)\heapshared.h $(PDWIN32_INCLUDE)\winimagepeldr.h
-
-pefile.OBJ:    pefile.cpp $(PDWIN32_INCLUDE)\pefile.h $(PDWIN32_INCLUDE)\winres.h
-
-winimagebase.obj:  winimagebase.cpp $(PDWIN32_INCLUDE)\winimagebase.h $(PDWIN32_INCLUDE)\windllbase.h
-winimagepe2lx.obj: winimagepe2lx.cpp $(PDWIN32_INCLUDE)\winimagebase.h $(PDWIN32_INCLUDE)\winimagepe2lx.h $(PDWIN32_INCLUDE)\windllbase.h
-winimagepeldr.obj: winimagepeldr.cpp $(PDWIN32_INCLUDE)\winimagebase.h $(PDWIN32_INCLUDE)\winimagepeldr.h $(PDWIN32_INCLUDE)\windllbase.h
-winimagelx.obj:    winimagelx.cpp $(PDWIN32_INCLUDE)\winimagebase.h $(PDWIN32_INCLUDE)\winimagelx.h
-windllbase.obj:    windllbase.cpp $(PDWIN32_INCLUDE)\windllbase.h $(PDWIN32_INCLUDE)\winimagebase.h profile.h
-windllpe2lx.obj:   windllpe2lx.cpp $(PDWIN32_INCLUDE)\windllbase.h $(PDWIN32_INCLUDE)\windllpe2lx.h \
-                   $(PDWIN32_INCLUDE)\winimagepe2lx.h $(PDWIN32_INCLUDE)\winimagebase.h
-windlllx.obj:      windlllx.cpp $(PDWIN32_INCLUDE)\windllbase.h $(PDWIN32_INCLUDE)\windlllx.h \
-                   $(PDWIN32_INCLUDE)\winimagelx.h $(PDWIN32_INCLUDE)\odinlx.h \
-                   $(PDWIN32_INCLUDE)\winimagebase.h $(PDWIN32_INCLUDE)\winimagelx.h
-windllpeldr.obj:   windllpeldr.cpp $(PDWIN32_INCLUDE)\windllbase.h $(PDWIN32_INCLUDE)\windllpeldr.h $(PDWIN32_INCLUDE)\winimagepeldr.h $(PDWIN32_INCLUDE)\winimagebase.h
-winexebase.obj:    winexebase.cpp $(PDWIN32_INCLUDE)\winexebase.h $(PDWIN32_INCLUDE)\winimagebase.h
-winexepe2lx.obj:   winexepe2lx.cpp $(PDWIN32_INCLUDE)\winexebase.h $(PDWIN32_INCLUDE)\winexepe2lx.h $(PDWIN32_INCLUDE)\winimagepe2lx.h $(PDWIN32_INCLUDE)\winimagebase.h
-winexelx.obj:      winexelx.cpp $(PDWIN32_INCLUDE)\winexebase.h $(PDWIN32_INCLUDE)\winexelx.h \
-                   $(PDWIN32_INCLUDE)\winimagelx.h $(PDWIN32_INCLUDE)\odinlx.h $(PDWIN32_INCLUDE)\winimagebase.h $(PDWIN32_INCLUDE)\winimagelx.h
-winexepeldr.obj:   winexepeldr.cpp $(PDWIN32_INCLUDE)\winexebase.h $(PDWIN32_INCLUDE)\winexepeldr.h $(PDWIN32_INCLUDE)\winimagepeldr.h $(PDWIN32_INCLUDE)\winimagebase.h
-winfakepeldr.obj:  winfakepeldr.cpp $(PDWIN32_INCLUDE)\winimagepeldr.h $(PDWIN32_INCLUDE)\winimagebase.h $(PDWIN32_INCLUDE)\winfakepeldr.h
-
-winimgres.OBJ: winimgres.cpp $(PDWIN32_INCLUDE)\winimagebase.h $(PDWIN32_INCLUDE)\pefile.h $(PDWIN32_INCLUDE)\winimagepe2lx.h $(PDWIN32_INCLUDE)\winimagepeldr.h $(PDWIN32_INCLUDE)\winimagelx.h $(PDWIN32_INCLUDE)\winres.h
-stubs.obj:     stubs.cpp stubs.h
-
-cvtbitmap.obj: cvtbitmap.cpp $(PDWIN32_INCLUDE)\winicon.h $(PDWIN32_INCLUDE)\misc.h cvtresource.h
-cvtaccel.obj: cvtaccel.cpp $(PDWIN32_INCLUDE)\winaccel.h $(PDWIN32_INCLUDE)\misc.h cvtresource.h
-cvticon.obj: cvticon.cpp $(PDWIN32_INCLUDE)\winicon.h $(PDWIN32_INCLUDE)\misc.h cvtresource.h
-cvticongrp.obj: cvticongrp.cpp $(PDWIN32_INCLUDE)\winicon.h $(PDWIN32_INCLUDE)\misc.h cvtresource.h
-cvtcursor.obj: cvtcursor.cpp $(PDWIN32_INCLUDE)\wincursor.h $(PDWIN32_INCLUDE)\winicon.h $(PDWIN32_INCLUDE)\misc.h cvtresource.h
-cvtcursorgrp.obj: cvtcursorgrp.cpp $(PDWIN32_INCLUDE)\wincursor.h $(PDWIN32_INCLUDE)\winicon.h $(PDWIN32_INCLUDE)\misc.h cvtresource.h
-
-interlock.obj: interlock.asm
-toolhelp.obj: toolhelp.cpp
-
-heapshared.obj: heapshared.cpp $(PDWIN32_INCLUDE)\heapshared.h
-heapcode.obj: heapcode.cpp $(PDWIN32_INCLUDE)\heapshared.h $(PDWIN32_INCLUDE)\heapcode.h
-cpu.obj: cpu.cpp $(PDWIN32_INCLUDE)\cpuhlp.h
-cpuhlp.obj: cpuhlp.asm
-environ.obj: environ.cpp $(PDWIN32_INCLUDE)\misc.h
-codepage.obj: codepage.cpp oslibdos.h profile.h $(PDWIN32_INCLUDE)\codepage.h
-
-debug.obj:      debug.cpp oslibdebug.h
-oslibdebug.obj: oslibdebug.cpp oslibdebug.h
-npipe.obj:      npipe.cpp oslibdos.h  $(PDWIN32_INCLUDE)\misc.h
-
 clean:
-        $(RM) *.OBJ *.LIB *.dll *.lrf *.res *.map *.pch kernelrsrc.asm
-        $(RM) $(PDWIN32_LIB)\$(TARGET).LIB
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(TARGET)exp.def
+    $(RM) *.OBJ *.LIB *.dll *.lrf *.res *.map *.pch kernelrsrc.asm \
+        $(PDWIN32_LIB)\$(TARGET).LIB $(PDWIN32_BIN)\$(TARGET).dll \
+        $(TARGET)exp.def \
Index: trunk/src/lz32/makefile
===================================================================
--- trunk/src/lz32/makefile	(revision 2707)
+++ trunk/src/lz32/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.8 2000-02-05 02:01:38 sandervl Exp $
+# $Id: makefile,v 1.9 2000-02-09 23:40:46 bird Exp $
 
 #
@@ -18,5 +18,4 @@
 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
-IMPLIBFLAGS = $(IMPLIBFLAGS)
 
 TARGET = lz32
@@ -28,19 +27,24 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET)exp.def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) \
-        $(PDWIN32_LIB)\odincrt.lib \
-        $(PDWIN32_LIB)\kernel32.lib \
-        os2386.lib \
-        $(RTLLIB_O) \
-        $(TARGET).def
-        $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) \
+          $(PDWIN32_LIB)\odincrt.lib \
+          $(PDWIN32_LIB)\kernel32.lib \
+          os2386.lib \
+          $(RTLLIB_O) \
+          $(TARGET).def
+    $(CP) $@ $(PDWIN32_BIN)
 
 
-$(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
 
 $(TARGET).lib: $(TARGET)exp.def
-	$(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-	$(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
+
+$(TARGET)exp.def: $(TARGET).def
+    $(IMPDEF) $** $@
 
 
@@ -48,11 +52,17 @@
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-lz32.obj: lz32.cpp lz32.h $(PDWIN32_INCLUDE)\win\debugtools.h
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-        $(RM) *exp.def *.obj *.lib *.dll *.map *.pch
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *exp.def *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
Index: trunk/src/mpr/makefile
===================================================================
--- trunk/src/mpr/makefile	(revision 2707)
+++ trunk/src/mpr/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.10 2000-02-05 02:02:10 sandervl Exp $
+# $Id: makefile,v 1.11 2000-02-09 23:40:46 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	mpr.dll makefile
+#       mpr.dll makefile
 #
 
@@ -28,29 +28,39 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-              OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
+          OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
+
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
 
 
-mpr.obj: mpr.cpp
+clean:
+    $(RM) *.obj *.lib *.dll *~ *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
-clean:
-	$(RM) *.obj *.lib *.dll *~ *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
-
Index: trunk/src/msacm32/makefile
===================================================================
--- trunk/src/msacm32/makefile	(revision 2707)
+++ trunk/src/msacm32/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.7 2000-02-05 02:02:34 sandervl Exp $
+# $Id: makefile,v 1.8 2000-02-09 23:40:47 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	msacm32.dll makefile
+#       msacm32.dll makefile
 #
 
@@ -23,5 +23,5 @@
 
 OBJS =  msacm32.obj filter.obj format.obj internal.obj \
-	stream.obj driver.obj  initterm.obj resource.obj
+        stream.obj driver.obj  initterm.obj resource.obj
 
 all: $(TARGET).dll $(TARGET).lib
@@ -29,37 +29,41 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/winmm.lib \
-	      $(PDWIN32_LIB)/advapi32.lib \
-	      OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/winmm.lib \
+          $(PDWIN32_LIB)/advapi32.lib \
+          OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-msacm32.obj: msacm32.cpp
-driver.obj: driver.cpp
-filter.obj: filter.cpp
-format.obj: format.cpp
-internal.obj: internal.cpp
-stream.obj: stream.cpp
-initterm.obj: initterm.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
 
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
 
Index: trunk/src/msvcrt/makefile
===================================================================
--- trunk/src/msvcrt/makefile	(revision 2707)
+++ trunk/src/msvcrt/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.10 2000-02-05 02:03:45 sandervl Exp $
+# $Id: makefile,v 1.11 2000-02-09 23:40:47 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	msvcrt.dll makefile
+#       msvcrt.dll makefile
 #
 
@@ -35,61 +35,76 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/crtdll.lib  \
-	      $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/crtdll.lib  \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 $(TARGET20).dll: $(OBJS20) $(TARGET20).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS20) $(TARGET20).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/crtdll.lib \
-	      $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS20) $(TARGET20).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/crtdll.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 $(TARGET40).dll: $(OBJS40) $(TARGET40).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS40) $(TARGET40).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/crtdll.lib  \
-	      $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS40) $(TARGET40).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/crtdll.lib  \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib  $(PDWIN32_LIB)\$(TARGET).lib \
+                    $(PDWIN32_LIB)\$(TARGET20).lib \
+                    $(PDWIN32_LIB)\$(TARGET40).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
+$(PDWIN32_LIB)\$(TARGET20).lib: $(TARGET20).lib
+    $(CP) $** $@
+
+$(PDWIN32_LIB)\$(TARGET40).lib: $(TARGET40).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET).def
-	$(IMPLIB) $(IMPLIBFLAGS) $@ $**
-	$(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET20).lib: $(TARGET20).def
-	$(IMPLIB) $(IMPLIBFLAGS) $@ $**
-	$(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET40).lib: $(TARGET40).def
-	$(IMPLIB) $(IMPLIBFLAGS) $@ $**
-	$(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
+    $(CP) $@ $(PDWIN32_LIB)
 
 resource.asm: msvcrt.rc
     $(RC) $(RCFLAGS) -o resource.asm msvcrt.rc
 
-resource.obj: resource.asm
-
 resource20.asm: msvcrt20.rc
     $(RC) $(RCFLAGS) -o resource20.asm msvcrt20.rc
-
-resource20.obj: resource20.asm
 
 resource40.asm: msvcrt40.rc
     $(RC) $(RCFLAGS) -o resource40.asm msvcrt40.rc
 
-resource40.obj: resource40.asm
 
-msvcrt.obj: msvcrt.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch resource*.asm
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch resource*.asm \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET20).dll \
+        $(PDWIN32_BIN)\$(TARGET40).dll \
+        $(PDWIN32_LIB)\$(TARGET).lib
+        $(PDWIN32_LIB)\$(TARGET20).lib
+        $(PDWIN32_LIB)\$(TARGET40).lib
 
-
-
-
-
Index: trunk/src/msvfw32/makefile
===================================================================
--- trunk/src/msvfw32/makefile	(revision 2707)
+++ trunk/src/msvfw32/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.5 2000-02-05 02:04:28 sandervl Exp $
+# $Id: makefile,v 1.6 2000-02-09 23:40:47 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	msvfw32.dll makefile
+#       msvfw32.dll makefile
 #
 
@@ -11,5 +11,4 @@
 PDWIN32_BIN = ..\..\bin
 PDWIN32_TOOLS = ..\..\tools\bin
-
 
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
@@ -28,29 +27,42 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/gdi32.lib \
-	      $(PDWIN32_LIB)/winmm.lib \
-	      $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/gdi32.lib \
+          $(PDWIN32_LIB)/winmm.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
+
+
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
 
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
+
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-msvfw32.obj: msvfw32.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
 
@@ -58,2 +70,3 @@
 
 
+
Index: trunk/src/odincrt/makefile
===================================================================
--- trunk/src/odincrt/makefile	(revision 2707)
+++ trunk/src/odincrt/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.14 2000-02-05 02:05:38 sandervl Exp $
+# $Id: makefile,v 1.15 2000-02-09 23:40:47 bird Exp $
 
 #
@@ -10,5 +10,5 @@
 PDWIN32_LIB = ..\..\lib
 PDWIN32_BIN = ..\..\bin
-
+PDWIN32_TOOLS = ..\..\tools\bin
 
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
@@ -30,23 +30,29 @@
 
 $(TARGET).dll: $(OBJS) $(RUNTIMELIBDEF)
-        $(LD) $(LDFLAGS_ODINCRT) -Fm -Fe$@ $(OBJS) $(RUNTIMELIBDEF) $(SOMLIB)
-        $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS_ODINCRT) -Fm -Fe$@ $(OBJS) $(RUNTIMELIBDEF) $(SOMLIB)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET).def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
+    $(CP) $@ $(PDWIN32_LIB)
 
-initterm.obj: initterm.cpp $(PDWIN32_INCLUDE)\exitlist.h
 
-string.obj: string.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-odincrt.obj: odincrt.asm
+!ifndef NODEP
+!include .depend
+!endif
 
-file.obj: file.cpp
 
 clean:
-        $(RM) *.obj *.lib *.dll *.map *.pch
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib
 
Index: trunk/src/ole32/makefile
===================================================================
--- trunk/src/ole32/makefile	(revision 2707)
+++ trunk/src/ole32/makefile	(revision 2709)
@@ -1,7 +1,9 @@
+# $Id: makefile,v 1.18 2000-02-09 23:40:48 bird Exp $
+
 #
-# PD-Win32 API 
+# PD-Win32 API
 #
-#	ole32.dll makefile
-# 
+#       ole32.dll makefile
+#
 
 PDWIN32_INCLUDE = ..\..\include
@@ -23,399 +25,86 @@
 OBJS =  ole32.obj \
         antimoniker.obj \
-	bindctx.obj \
-	clsid.obj \
+        bindctx.obj \
+        clsid.obj \
         compositemoniker.obj \
         datacache.obj \
         defaulthandler.obj \
         filemoniker.obj \
-	guid.obj \
-	hglobalstream.obj \
-	initialise.obj \
-	itemmoniker.obj \
-	iunknown.obj \
-	library.obj \
+        guid.obj \
+        hglobalstream.obj \
+        initialise.obj \
+        itemmoniker.obj \
+        iunknown.obj \
+        library.obj \
         memlockbytes.obj \
         moniker.obj \
-	oString.obj \
-	ole2.obj \
-	oleobj.obj \
-	oleClip.obj \
-	oleDrag.obj \
-	oleMenu.obj \
-	stg_bigblockfile.obj \
-	stg_stream.obj \
-	storage.obj \
-	stubs.obj \
-	taskmem.obj resource.obj  $(PDWIN32_LIB)/dllentry.obj
+        oString.obj \
+        ole2.obj \
+        oleobj.obj \
+        oleClip.obj \
+        oleDrag.obj \
+        oleMenu.obj \
+        stg_bigblockfile.obj \
+        stg_stream.obj \
+        storage.obj \
+        stubs.obj \
+        taskmem.obj resource.obj  $(PDWIN32_LIB)/dllentry.obj
 
 all: $(TARGET).dll $(ORGTARGET).lib regsvr32.exe
 
 
-$(TARGET).dll: $(OBJS) $(ORGTARGET).def 
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(ORGTARGET).def \
-              $(PDWIN32_LIB)\user32.lib \
-              $(PDWIN32_LIB)\gdi32.lib \
-              $(PDWIN32_LIB)\comctl32.lib \
-              $(PDWIN32_LIB)\advapi32.lib \
-              $(PDWIN32_LIB)\kernel32.lib \
-              $(PDWIN32_LIB)\oleaut32.lib \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+$(TARGET).dll: $(OBJS) $(ORGTARGET).def
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(ORGTARGET).def \
+          $(PDWIN32_LIB)\user32.lib \
+          $(PDWIN32_LIB)\gdi32.lib \
+          $(PDWIN32_LIB)\comctl32.lib \
+          $(PDWIN32_LIB)\advapi32.lib \
+          $(PDWIN32_LIB)\kernel32.lib \
+          $(PDWIN32_LIB)\oleaut32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
+
+
+lib: $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
+
+$(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
+    $(CP) $** $@
 
 $(ORGTARGET).lib: $(ORGTARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(ORGTARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(ORGTARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(ORGTARGET)exp.def: $(ORGTARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
+
 
 resource.asm: $(ORGTARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(ORGTARGET).rc
 
-resource.obj: resource.asm
 
-.\stubs.obj: \
-    .\stubs.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h
-
-.\storage.obj: \
-    .\storage.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/debugtools.h \
-    $(PDWIN32_INCLUDE)/heapstring.h \
-    .\storage.h \
-    $(PDWIN32_INCLUDE)/win/wtypes.h \
-    $(PDWIN32_INCLUDE)/win/winnt.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_storage.h
-
-.\stg_stream.obj: \
-    .\stg_stream.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/debugtools.h \
-    $(PDWIN32_INCLUDE)/heapstring.h \
-    .\storage.h \
-    $(PDWIN32_INCLUDE)/win/wtypes.h \
-    $(PDWIN32_INCLUDE)/win/winnt.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_storage.h
-
-.\stg_bigblockfile.obj: \
-    .\stg_bigblockfile.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/debugtools.h \
-    $(PDWIN32_INCLUDE)/heapstring.h \
-    .\storage.h \
-    $(PDWIN32_INCLUDE)/win/wtypes.h \
-    $(PDWIN32_INCLUDE)/win/winnt.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_storage.h
-
-.\regsvr32.obj: \
-    .\regsvr32.cpp
-
-.\oString.obj: \
-    .\oString.cpp \
-    .\ole32.h \
-    .\oString.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h
-
-.\oleobj.obj: \
-    .\oleobj.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/debugtools.h
-
-.\oleMenu.obj: \
-    .\oleMenu.cpp \
-    .\ole32.h \
-    .\oString.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/commctrl.h
-
-.\oleDrag.obj: \
-    .\oleDrag.cpp \
-    .\ole32.h \
-    .\oString.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/commctrl.h
-
-.\oleClip.obj: \
-    .\oleClip.cpp \
-    .\ole32.h \
-    .\oString.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/commctrl.h
-
-.\ole32.obj: \
-    .\ole32.cpp \
-    .\ole32.h \
-    .\oString.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    .\filemoniker.h \
-    .\moniker.h
-
-.\ole2.obj: \
-    .\ole2.cpp \
-    .\ole32.h \
-    .\oString.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/commctrl.h
-
-.\moniker.obj: \
-    .\moniker.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    .\moniker.h
-
-.\memlockbytes.obj: \
-    .\memlockbytes.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/debugtools.h
-
-.\library.obj: \
-    .\library.cpp \
-    .\ole32.h \
-    .\oString.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    .\moniker.h
-
-.\iunknown.obj: \
-    .\iunknown.cpp \
-    .\ole32.h \
-    .\oString.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h
-
-.\itemmoniker.obj: \
-    .\itemmoniker.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/debugtools.h \
-    $(PDWIN32_INCLUDE)/heapstring.h
-
-.\initialise.obj: \
-    .\initialise.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h
-
-.\hglobalstream.obj: \
-    .\hglobalstream.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/debugtools.h \
-    $(PDWIN32_INCLUDE)/heapstring.h
-
-.\guid.obj: \
-    .\guid.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h
-
-.\filemoniker.obj: \
-    .\filemoniker.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/debugtools.h \
-    $(PDWIN32_INCLUDE)/heapstring.h \
-    .\filemoniker.h
-
-.\defaulthandler.obj: \
-    .\defaulthandler.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/debugtools.h \
-    $(PDWIN32_INCLUDE)/heapstring.h \
-    $(PDWIN32_INCLUDE)/win/oleauto.h
-
-.\datacache.obj: \
-    .\datacache.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/debugtools.h \
-    $(PDWIN32_INCLUDE)/heapstring.h
-
-.\compositemoniker.obj: \
-    .\compositemoniker.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/debugtools.h
-
-.\clsid.obj: \
-    .\clsid.cpp \
-    .\ole32.h \
-    .\oString.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h
-
-.\bindctx.obj: \
-    .\bindctx.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/debugtools.h \
-    $(PDWIN32_INCLUDE)/heapstring.h
-
-.\antimoniker.obj: \
-    .\antimoniker.cpp \
-    .\ole32.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h \
-    $(PDWIN32_INCLUDE)/win/debugtools.h
-
-.\taskmem.obj: \
-    .\taskmem.cpp \
-    .\ole32.h \
-    .\oString.h \
-    $(PDWIN32_INCLUDE)/win/objbase.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_inplace.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleobj.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_surrogate.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_oleview.h \
-    $(PDWIN32_INCLUDE)/win/wine/obj_cache.h
-
-regsvr32.obj:	regsvr32.cpp
+regsvr32.obj:   regsvr32.cpp
     $(CC) -C $(CXXFLAGS) -Ge+ -Tm+ $**
 
-regsvr32.exe:	regsvr32.obj regsvr32.def \
-		$(PDWIN32_LIB)/user32.lib \
-		$(PDWIN32_LIB)/kernel32.lib \
-		$(PDWIN32_LIB)/ole32.lib
-	$(LD) $(LDFLAGS) -Ge+ -Fm -Fe$@ $** \
-		$(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+regsvr32.exe:   regsvr32.obj regsvr32.def \
+                $(PDWIN32_LIB)/user32.lib \
+                $(PDWIN32_LIB)/kernel32.lib \
+                $(PDWIN32_LIB)/ole32.lib
+    $(LD) $(LDFLAGS) -Ge+ -Fm -Fe$@ $** \
+            $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
+
+
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch	
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
-	$(RM) $(PDWIN32_BIN)\regsvr32.exe
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        $(PDWIN32_BIN)\regsvr32.exe resource.asm $(TARGET)exp.def
 
-
Index: trunk/src/ole32/ole32exp.def
===================================================================
--- trunk/src/ole32/ole32exp.def	(revision 2707)
+++ trunk/src/ole32/ole32exp.def	(revision 2709)
@@ -45,5 +45,5 @@
     _CoRevokeClassObject@4                    @40
     _CoRevokeMallocSpy@0                      @41
-    _CoSetState@0                             @42
+    _CoSetState@4                             @42
     _CoTaskMemAlloc@4                         @43
     _CoTaskMemFree@4                          @44
Index: trunk/src/oleaut32/makefile
===================================================================
--- trunk/src/oleaut32/makefile	(revision 2707)
+++ trunk/src/oleaut32/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.14 2000-02-05 02:07:04 sandervl Exp $
+# $Id: makefile,v 1.15 2000-02-09 23:40:48 bird Exp $
 #
-# PD-Win32 API 
+# PD-Win32 API
 #
-#	ole32.dll makefile
-# 
+#       ole32.dll makefile
+#
 
 PDWIN32_INCLUDE = ..\..\include
@@ -16,5 +16,5 @@
 
 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) 
+CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
 
 !ifdef NODEBUGINFO
@@ -27,72 +27,65 @@
 
 OBJS =  oleaut32.obj guid.obj \
-	oList.obj \
-	initterm.obj olefont.obj \
-	variant.obj \
-	ole2disp.obj parsedt.obj \
-	iPicture.obj \
-	iPictureNone.obj \
-	iPictureBmp.obj \
-	iPictureMeta.obj \
-	iPictureIcon.obj \
-	iPictureEmf.obj \
-	typelib.obj \
-	itypelib.obj \
-	itypeinfo.obj \
-	hash.obj \
-	safearray.obj stubs.obj resource.obj
+        oList.obj \
+        initterm.obj olefont.obj \
+        variant.obj \
+        ole2disp.obj parsedt.obj \
+        iPicture.obj \
+        iPictureNone.obj \
+        iPictureBmp.obj \
+        iPictureMeta.obj \
+        iPictureIcon.obj \
+        iPictureEmf.obj \
+        typelib.obj \
+        itypelib.obj \
+        itypeinfo.obj \
+        hash.obj \
+        safearray.obj stubs.obj resource.obj
 
 all: $(TARGET).dll $(ORGTARGET).lib
 
 
-$(TARGET).dll: $(OBJS) $(ORGTARGET).def 
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(ORGTARGET).def \
-              $(PDWIN32_LIB)\pmwinx.lib \
-              $(PDWIN32_LIB)\advapi32.lib \
-              $(PDWIN32_LIB)\kernel32.lib \
-              $(PDWIN32_LIB)\user32.lib \
-              $(PDWIN32_LIB)\ole32.lib \
-              $(PDWIN32_LIB)\gdi32.lib \
-               $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+$(TARGET).dll: $(OBJS) $(ORGTARGET).def
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(ORGTARGET).def \
+          $(PDWIN32_LIB)\pmwinx.lib \
+          $(PDWIN32_LIB)\advapi32.lib \
+          $(PDWIN32_LIB)\kernel32.lib \
+          $(PDWIN32_LIB)\user32.lib \
+          $(PDWIN32_LIB)\ole32.lib \
+          $(PDWIN32_LIB)\gdi32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+
+lib: $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
+
+$(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
+    $(CP) $** $@
+
 $(ORGTARGET).lib: $(ORGTARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(ORGTARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(ORGTARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(ORGTARGET)exp.def: $(ORGTARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
+
 
 resource.asm: $(ORGTARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(ORGTARGET).rc
 
-resource.obj: resource.asm
 
-hash.obj:		hash.cpp oList.h
-oList.obj:		oList.cpp oList.h
-oleaut32.obj:		oleaut32.cpp oleaut32.h
-initterm.obj:		initterm.cpp $(PDWIN32_INCLUDE)\exitlist.h
-ole2disp.obj:   	ole2disp.cpp oleaut32.h
-variant.obj:    	variant.cpp parsedt.h
-typelib.obj:		typelib.cpp oleaut32.h oList.h itypelib.h
-itypelib.obj:		itypelib.cpp oleaut32.h oList.h itypelib.h
-itypeinfo.obj:		itypeinfo.cpp oleaut32.h oList.h itypelib.h
-olefont.obj:		olefont.cpp oleaut32.h
-iPicture.obj:		iPicture.cpp iPicture.h oleaut32.h
-iPictureNone.obj:	iPictureNone.cpp iPicture.h oleaut32.h
-iPictureBmp.obj:	iPictureBmp.cpp iPicture.h oleaut32.h
-iPictureIcon.obj:	iPictureIcon.cpp iPicture.h oleaut32.h
-iPictureMeta.obj:	iPictureMeta.cpp iPicture.h oleaut32.h
-iPictureEmf.obj:	iPictureEmf.cpp iPicture.h oleaut32.h
-parsedt.obj:		parsedt.cpp parsedt.h
-safearray.obj:  	safearray.cpp oleaut32.h
-guid.obj:       	guid.cpp
-stubs.obj:      	stubs.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(ORGTARGET).lib \
+        resource.asm $(ORGTARGET)exp.def
 
-
Index: trunk/src/olecli32/makefile
===================================================================
--- trunk/src/olecli32/makefile	(revision 2707)
+++ trunk/src/olecli32/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.6 2000-02-05 02:07:39 sandervl Exp $
+# $Id: makefile,v 1.7 2000-02-09 23:40:49 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	olecli32.dll makefile
+#       olecli32.dll makefile
 #
 
@@ -28,31 +28,38 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-olecli32.obj: olecli32.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
-
-
-
-
Index: trunk/src/oledlg/makefile
===================================================================
--- trunk/src/oledlg/makefile	(revision 2707)
+++ trunk/src/oledlg/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.6 2000-02-05 02:08:16 sandervl Exp $
+# $Id: makefile,v 1.7 2000-02-09 23:40:49 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	oledlg.dll makefile
+#       oledlg.dll makefile
 #
 
@@ -28,16 +28,21 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 
@@ -45,15 +50,17 @@
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-oledlg.obj: oledlg.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
-
-
-
-
Index: trunk/src/olesvr32/makefile
===================================================================
--- trunk/src/olesvr32/makefile	(revision 2707)
+++ trunk/src/olesvr32/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.6 2000-02-05 02:08:48 sandervl Exp $
+# $Id: makefile,v 1.7 2000-02-09 23:40:49 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	olesvr32.dll makefile
+#       olesvr32.dll makefile
 #
 
@@ -28,16 +28,21 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 
@@ -45,15 +50,17 @@
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-olesvr32.obj: olesvr32.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
-
-
-
-
Index: trunk/src/opengl/glu/makefile
===================================================================
--- trunk/src/opengl/glu/makefile	(revision 2707)
+++ trunk/src/opengl/glu/makefile	(revision 2709)
@@ -1,3 +1,4 @@
-# $Id: makefile,v 1.7 2000-02-09 14:49:36 sandervl Exp $
+# $Id: makefile,v 1.8 2000-02-09 23:40:50 bird Exp $
+
 #
 # PD-Win32
@@ -314,4 +315,5 @@
   util\registry.obj
 
+
 $(TARGET).DLL: $(SOURCES) initterm.obj resource.obj $(TARGET).lrf $(TARGET).def
     cd util
@@ -325,6 +327,7 @@
     $(CP) $@ $(PDWIN32_BIN)
 
+
 $(TARGET).lrf: makefile
-  @echo Creating file <<$(@B).lrf
+    @echo Creating file <<$(@B).lrf
 $(OBJS)
 /OUT:$(TARGET).DLL
@@ -337,4 +340,5 @@
 <<keep
 
+
 $(TARGET).lib: $(TARGET)exp.def
         $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
@@ -344,21 +348,34 @@
         $(IMPDEF) $** $@
 
+
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
-
-initterm.obj: initterm.cpp
+
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+    cd util
+    $(MAKE_CMD) NODEP=1 dep
+    cd ..\tess
+    $(MAKE_CMD) NODEP=1 dep
+    cd ..\nurbs
+    $(MAKE_CMD) NODEP=1 dep
+    cd ..
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-        $(RM) *.obj *.dll *.lib *.lrf *exp.def resource.asm
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
-        cd util
-        $(MAKE_CMD) clean
-        cd ..\tess
-        $(MAKE_CMD) clean
-        cd ..\nurbs
-        $(MAKE_CMD) clean
-        cd ..
-
+    $(RM) *.obj *.dll *.lib *.lrf *exp.def resource.asm \
+      $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+    cd util
+    $(MAKE_CMD) clean
+    cd ..\tess
+    $(MAKE_CMD) clean
+    cd ..\nurbs
+    $(MAKE_CMD) clean
+    cd ..
+
Index: trunk/src/opengl/glu/nurbs/interface/makefile
===================================================================
--- trunk/src/opengl/glu/nurbs/interface/makefile	(revision 2707)
+++ trunk/src/opengl/glu/nurbs/interface/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.1 2000-02-09 08:49:03 jeroen Exp $
+# $Id: makefile,v 1.2 2000-02-09 23:40:51 bird Exp $
 #
 # PD-Win32 API
@@ -14,8 +14,8 @@
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I..\.. -I..\internals -I..\nurbtess -I..\..\..\mesa
+CINCLUDE=-I..\.. -I..\internals -I..\nurbtess -I..\..\..\mesa -I$(PDWIN32_INCLUDE) -I..\..\include
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) -I$(PDWIN32_INCLUDE) -I..\..\include -DNDEBUG
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -I$(PDWIN32_INCLUDE) -I..\..\include -DNDEBUG
+CFLAGS = $(CFLAGS) $(CINCLUDE)  -DNDEBUG
+CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -DNDEBUG
 
 OBJS = glcurveval.obj glinterface.obj glrenderer.obj glsurfeval.obj \
@@ -25,18 +25,15 @@
 all: $(OBJS)
 
-#
-# Dependencies
-#
-glcurveval.obj: glcurveval.cpp glimports.h glrenderer.h glcurveval.h
-glinterface.obj: glinterface.cpp glimports.h glrenderer.h
-glrenderer.obj: glrenderer.cpp glimports.h glrenderer.h
-glsurfeval.obj: glsurfeval.cpp glimports.h glrenderer.h glsurfeval.h bezierPatchMesh.h
-insurfeval.obj: insurfeval.cpp glsurfeval.h
-bezierPatch.obj: bezierPatch.cpp bezierPatch.h bezierEval.h
-bezierEval.obj: bezierEval.cpp bezierEval.h
-bezierPatchMeshobj: bezierPatchMesh.cpp bezierPatchMesh.h bezierEval.h
-incurveeval.obj: incurveeval.cpp glcurveval.h
+
+dep:
+    $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc \
+        ..\internals\*.h ..\nurbtess\*.h ..\..\..\mesa\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-    $(RM) *.obj
+    $(RM) *.obj *.pch
 
Index: trunk/src/opengl/glu/nurbs/internals/makefile
===================================================================
--- trunk/src/opengl/glu/nurbs/internals/makefile	(revision 2707)
+++ trunk/src/opengl/glu/nurbs/internals/makefile	(revision 2709)
@@ -1,3 +1,4 @@
-# $Id: makefile,v 1.1 2000-02-09 08:50:24 jeroen Exp $
+# $Id: makefile,v 1.2 2000-02-09 23:40:51 bird Exp $
+
 #
 # PD-Win32 API
@@ -14,9 +15,9 @@
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa
+CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa -I..\..\include -I$(PDWIN32_INCLUDE)
 CDEFS=-DSTANDALONE -DLIBRARYBUILD -DNDEBUG
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) -I..\..\include -I$(PDWIN32_INCLUDE) $(CDEFS)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -I..\..\include -I$(PDWIN32_INCLUDE) $(CDEFS)
+CFLAGS = $(CFLAGS) $(CINCLUDE) $(CDEFS)
+CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) $(CDEFS)
 
 OBJS = arc.obj arcsorter.obj arctess.obj backend.obj basiccrveval.obj \
@@ -33,54 +34,15 @@
 all: $(OBJS)
 
-#
-# Dependencies
-#
-arc.obj: arc.cpp myassert.h arc.h bin.h bezierarc.h pwlarc.h simplemath.h
-arcsorter.obj: arcsorter.cpp arc.h arcsorter.h subdivider.h
-arctess.obj: arctess.cpp myassert.h arctess.h bufpool.h simplemath.h bezierarc.h trimvertex.h trimvertpool.h
-backend.obj: backend.cpp backend.h basiccrveval.h basicsurfeval.h nurbsconsts.h
-basiccrveval.obj: basiccrveval.cpp types.h basiccrveval.h
-basicsurfeval.obj: basicsurfeval.cpp types.h basicsurfeval.h
-bin.obj: bin.cpp myassert.h bin.h
-bufpool.obj: bufpool.cpp myassert.h bufpool.h
-cachingeval.obj: cachingeval.cpp cachingeval.h
-ccw.obj: ccw.cpp myassert.h subdivider.h types.h arc.h trimvertex.h simplemath.h mysetjmp.h
-coveandtiler.obj: coveandtiler.cpp myassert.h coveandtiler.h gridvertex.h gridtrimvertex.h uarray.h backend.h
-curve.obj: curve.cpp myassert.h mymath.h curve.h mapdesc.h types.h quilt.h nurbsconsts.h
-curvelist.obj: curvelist.cpp myassert.h quilt.h curvelist.h curve.h nurbsconsts.h types.h
-curvesub.obj: curvesub.cpp myassert.h subdivider.h renderhints.h backend.h quilt.h curvelist.h curve.h nurbsconsts.h
-displaylist.obj: displaylist.cpp nurbstess.h displaylist.h
-flist.obj: flist.cpp myassert.h flist.h
-flistsorter.obj: flistsorter.cpp flistsorter.h
-hull.obj: hull.cpp myassert.h hull.h gridvertex.h gridtrimvertex.h gridline.h trimline.h uarray.h trimregion.h
-intersect.obj: intersect.cpp myassert.h subdivider.h arc.h bin.h backend.h trimvertpool.h
-knotvector.obj: knotvector.cpp myassert.h knotvector.h defines.h
-mapdesc.obj: mapdesc.cpp myassert.h mystring.h mymath.h backend.h nurbsconsts.h mapdesc.h
-mapdescv.obj: mapdescv.cpp myassert.h mystring.h mymath.h nurbsconsts.h mapdesc.h
-maplist.obj: maplist.cpp myassert.h mymath.h nurbsconsts.h maplist.h mapdesc.h backend.h
-mesher.obj: mesher.cpp myassert.h mesher.h gridvertex.h gridtrimvertex.h jarcloc.h gridline.h trimline.h uarray.h backend.h
-monotonizer.obj: monotonizer.cpp myassert.h arc.h arctess.h bezierarc.h bin.h mapdesc.h nurbsconsts.h subdivider.h
-mycode.obj: mycode.cpp mymath.h
-nurbsinterfac.obj: nurbsinterfac.cpp nurbsconsts.h nurbstess.h bufpool.h quilt.h displaylist.h knotvector.h mapdesc.h
-nurbstess.obj: nurbstess.cpp myassert.h mysetjmp.h nurbsconsts.h nurbstess.h bufpool.h quilt.h knotvector.h mapdesc.h maplist.h
-patch.obj: patch.cpp myassert.h mymath.h mystring.h patch.h mapdesc.h quilt.h nurbsconsts.h simplemath.h
-patchlist.obj: patchlist.cpp myassert.h quilt.h patchlist.h patch.h nurbsconsts.h
-quilt.obj: quilt.cpp myassert.h quilt.h backend.h mapdesc.h flist.h knotvector.h patchlist.h simplemath.h
-reader.obj: reader.cpp nurbsconsts.h reader.h trimvertex.h simplemath.h
-renderhints.obj: renderhints.cpp renderhints.h defines.h nurbsconsts.h
-slicer.obj: slicer.cpp myassert.h bufpool.h slicer.h backend.h arc.h gridtrimvertex.h trimvertex.h varray.h
-sorter.obj: sorter.cpp sorter.h
-splitarcs.obj: splitarcs.cpp myassert.h subdivider.h arcsorter.h arc.h bin.h
-subdivider.obj: subdivider.cpp myassert.h subdivider.h arc.h bezierarc.h bin.h renderhints.h backend.h mapdesc.h quilt.h patchlist.h patch.h nurbsconsts.h trimvertpool.h simplemath.h
-tobezier.obj: tobezier.cpp myassert.h mystring.h quilt.h knotvector.h
-trimline.obj: trimline.cpp myassert.h backend.h trimline.h
-trimregion.obj: trimregion.cpp myassert.h backend.h trimregion.h
-trimvertpool.obj: trimvertpool.cpp myassert.h mystring.h trimvertex.h trimvertpool.h bufpool.h
-uarray.obj: uarray.cpp myassert.h uarray.h arc.h
-varray.obj: varray.cpp myassert.h varray.h arc.h
-dataTransform.obj: dataTransform.cpp myassert.h nurbsconsts.h trimvertex.h datatransform.h
-monoTriangulationBackend.obj: monoTriangulationBackend.cpp backend.h arc.h
+
+dep:
+    $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc  \
+        ..\nurbtess\*.h ..\..\..\mesa\*.h ..\..\include\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-    $(RM) *.obj
+    $(RM) *.obj *.pch
 
Index: trunk/src/opengl/glu/nurbs/makefile
===================================================================
--- trunk/src/opengl/glu/nurbs/makefile	(revision 2707)
+++ trunk/src/opengl/glu/nurbs/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.2 2000-02-09 12:08:32 bird Exp $
+# $Id: makefile,v 1.3 2000-02-09 23:40:51 bird Exp $
 #
 # PD-Win32 API
@@ -17,18 +17,30 @@
 
 all:
-        cd interface
-        $(MAKE_CMD)
-        cd ..\internals
-        $(MAKE_CMD)
-        cd ..\nurbtess
-        $(MAKE_CMD)
-        cd ..
+    cd interface
+    $(MAKE_CMD)
+    cd ..\internals
+    $(MAKE_CMD)
+    cd ..\nurbtess
+    $(MAKE_CMD)
+    cd ..
+
+
+dep:
+    cd interface
+    $(MAKE_CMD) NODEP=1 dep
+    cd ..\internals
+    $(MAKE_CMD) NODEP=1 dep
+    cd ..\nurbtess
+    $(MAKE_CMD) NODEP=1 dep
+    cd ..
+
 
 clean:
-        cd interface
-        $(MAKE_CMD) clean
-        cd ..\internals
-        $(MAKE_CMD) clean
-        cd ..\nurbtess
-        $(MAKE_CMD) clean
-        cd ..
+    cd interface
+    $(MAKE_CMD) clean
+    cd ..\internals
+    $(MAKE_CMD) clean
+    cd ..\nurbtess
+    $(MAKE_CMD) clean
+    cd ..
+
Index: trunk/src/opengl/glu/nurbs/nurbtess/makefile
===================================================================
--- trunk/src/opengl/glu/nurbs/nurbtess/makefile	(revision 2707)
+++ trunk/src/opengl/glu/nurbs/nurbtess/makefile	(revision 2709)
@@ -1,3 +1,4 @@
-# $Id: makefile,v 1.1 2000-02-09 08:48:27 jeroen Exp $
+# $Id: makefile,v 1.2 2000-02-09 23:40:51 bird Exp $
+
 #
 # PD-Win32 API
@@ -15,8 +16,8 @@
 
 
-CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa
+CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa -I$(PDWIN32_INCLUDE) -I..\..\include
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) -I$(PDWIN32_INCLUDE) -I..\..\include -DNDEBUG
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -I$(PDWIN32_INCLUDE) -I..\..\include -DNDEBUG
+CFLAGS = $(CFLAGS) $(CINCLUDE) -DNDEBUG
+CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -DNDEBUG
 
 OBJS = directedLine.obj gridWrap.obj monoTriangulation.obj partitionY.obj \
@@ -28,28 +29,15 @@
 all: $(OBJS)
 
-#
-# Dependencies
-#
-directedLine.obj: directedLine.cpp glimports.h zlassert.h quicksort.h directedLine.h polyDBG.h
-gridWrap.obj: gridWrap.cpp zlassert.h gridWrap.h
-monoTriangulation.obj: monoTriangulation.cpp glimports.h zlassert.h monoTriangulation.h polyUtil.h partitionX.h monoPolyPart.h
-partitionY.obj: partitionY.cpp zlassert.h partitionY.h searchTree.h quicksort.h polyUtil.h
-polyDBG.obj: polyDBG.cpp zlassert.h polyDBG.h
-polyUtil.obj: polyUtil.cpp polyUtil.h
-primitiveStream.obj: primitiveStream.cpp primitiveStream.h
-quicksort.obj: quicksort.cpp
-rectBlock.obj: rectBlock.cpp glimports.h zlassert.h rectBlock.h
-sampleComp.obj: sampleComp.cpp glimports.h sampleComp.h sampleCompTop.h sampleCompBot.h sampleCompRight.h
-sampleCompBot.obj: sampleCompBot.cpp zlassert.h sampleCompTop.h sampleCompBot.h
-sampleCompRight.obj: sampleCompRight.cpp glimports.h zlassert.h sampleCompRight.h
-sampleCompTop.obj: sampleCompTop.cpp zlassert.h sampleCompTop.h sampleCompRight.h
-sampleMonoPoly.obj: sampleMonoPoly.cpp glimports.h zlassert.h sampleMonoPoly.h sampleComp.h polyDBG.h partitionX.h
-sampledLine.obj: sampledLine.cpp glimports.h zlassert.h sampledLine.h
-searchTree.obj: searchTree.cpp zlassert.h searchTree.h
-partitionX.obj: partitionX.cpp partitionX.h
-monoChain.obj: monoChain.cpp glimports.h zlassert.h monoChain.h quicksort.h searchTree.h polyUtil.h
-monoPolyPart.obj: monoPolyPart.cpp directedLine.h monoPolyPart.h
+
+dep:
+    $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc  \
+        ..\..\mesa\*.h ..\nurbtess\*.h ..\internals\*.h ..\..\include\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-    $(RM) *.obj
+    $(RM) *.obj *.pch
 
Index: trunk/src/opengl/glu/tess/makefile
===================================================================
--- trunk/src/opengl/glu/tess/makefile	(revision 2707)
+++ trunk/src/opengl/glu/tess/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.1 2000-02-09 08:47:34 jeroen Exp $
+# $Id: makefile,v 1.2 2000-02-09 23:40:51 bird Exp $
 #
 # PD-Win32 API
@@ -14,9 +14,9 @@
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I.. -I..\..\mesa
+CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include
 CDEFS=-DNDEBUG -Tdp
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) -I$(PDWIN32_INCLUDE) $(CDEFS) -I..\include -DNDEBUG
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -I$(PDWIN32_INCLUDE) -$(CDEFS) -I..\include -DNDEBUG
+CFLAGS = $(CFLAGS) $(CINCLUDE) $(CDEFS) -DNDEBUG
+CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -$(CDEFS) -DNDEBUG
 
 OBJS= dict.obj memalloc.obj mesh.obj normal.obj priorityq.obj \
@@ -25,17 +25,13 @@
 all: $(OBJS)
 
-#
-# Dependencies
-#
-dict.obj: dict.c dict-list.h memalloc.h
-memalloc.obj: memalloc.c memalloc.h
-mesh.obj: mesh.c mesh.h memalloc.h
-normal.obj: normal.c mesh.h tess.h normal.h
-priorityq.obj: priorityq.c memalloc.c priorityq-heap.h priorityq-sort.h
-render.obj: render.c mesh.h tess.h render.h
-sweep.obj: sweep.c mesh.h geom.h tess.h dict.h priorityq.h memalloc.h sweep.h
-tess.obj: tess.c memalloc.c tess.h mesh.h normal.h sweep.h tessmono.h render.h
-tessmono.obj: tessmono.c geom.h mesh.h tessmono.h
-geom.obj: geom.c mesh.h geom.h
+
+dep:
+    $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc  \
+        ..\..\mesa\*.h ..\*.h ..\include\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
Index: trunk/src/opengl/glu/util/makefile
===================================================================
--- trunk/src/opengl/glu/util/makefile	(revision 2707)
+++ trunk/src/opengl/glu/util/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.1 2000-02-09 08:47:12 jeroen Exp $
+# $Id: makefile,v 1.2 2000-02-09 23:40:51 bird Exp $
 #
 # PD-Win32 API
@@ -14,8 +14,8 @@
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I.. -I..\..\mesa
+CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) -I$(PDWIN32_INCLUDE) -I..\include -Tdp -DNDEBUG
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -I$(PDWIN32_INCLUDE) -I..\include -Tdp -DNDEBUG
+CFLAGS = $(CFLAGS) $(CINCLUDE) -Tdp -DNDEBUG
+CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)  -Tdp -DNDEBUG
 
 OBJS= error.obj glue.obj mipmap.obj project.obj quad.obj registry.obj
@@ -23,13 +23,13 @@
 all: $(OBJS)
 
-#
-# Dependencies
-#
-error.obj: error.c
-glue.obj: glue.c gluint.h
-mipmap.obj: mipmap.c gluint.h
-project.obj: project.c gluint.h
-quad.obj: quad.c gluint.h
-registry.obj: registry.c
+
+dep:
+    $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc \
+        ..\include\*.h ..\..\mesa\*.h ..\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
Index: trunk/src/opengl/glut/Makefile
===================================================================
--- trunk/src/opengl/glut/Makefile	(revision 2707)
+++ trunk/src/opengl/glut/Makefile	(revision 2709)
@@ -1,3 +1,4 @@
-# $Id: Makefile,v 1.5 2000-02-09 14:46:26 sandervl Exp $
+# $Id: Makefile,v 1.6 2000-02-09 23:40:52 bird Exp $
+
 #
 # PD-Win32 API
@@ -41,74 +42,13 @@
        win32_x11.obj glut_term.obj initterm.obj resource.obj
 
-all     : $(TARGET).DLL
+all: $(TARGET).DLL
 
 $(TARGET).DLL: $(OBJS) $(TARGET).def $(TARGET).lrf
-        ILINK /FREE /NOE $(L) @$(TARGET).lrf
-        $(CP) $@ $(PDWIN32_BIN)
+    ILINK /FREE /NOE $(L) @$(TARGET).lrf
+    $(CP) $@ $(PDWIN32_BIN)
 
-$(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
-
-resource.obj: resource.asm
-
-initterm.obj: initterm.cpp
-win32_glx.obj: win32_glx.c os2_glx.h
-win32_x11.obj: win32_x11.c os2_x11.h
-win32_menu.obj: win32_menu.c glutint.h glut.h
-win32_util.obj: win32_util.c glutint.h
-win32_winproc.obj: win32_winproc.c glutint.h
-
-glut_mroman.obj: glut_mroman.c glutint.h
-glut_roman.obj: glut_roman.c glutint.h
-glut_hel12.obj: glut_hel12.c glutint.h
-glut_8x13.obj: glut_8x13.c glutint.h
-glut_hel18.obj: glut_hel18.c glutint.h
-glut_9x15.obj: glut_9x15.c glutint.h
-glut_tr10.obj: glut_tr10.c glutint.h
-glut_hel10.obj: glut_hel10.c glutint.h
-glut_tr24.obj: glut_tr24.c glutint.h
-
-glut_bitmap.obj: glut_bitmap.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_bwidth.obj: glut_bwidth.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_cindex.obj: glut_cindex.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_cmap.obj: glut_cmap.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_cursor.obj: glut_cursor.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_dials.obj: glut_dials.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_dstr.obj: glut_dstr.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_event.obj: glut_event.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_ext.obj: glut_ext.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_fullscrn.obj: glut_fullscrn.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_gamemode.obj: glut_gamemode.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_get.obj: glut_get.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_init.obj: glut_init.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_input.obj: glut_input.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_joy.obj: glut_joy.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_key.obj: glut_key.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_keyctrl.obj: glut_keyctrl.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_keyup.obj: glut_keyup.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_mesa.obj: glut_mesa.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_modifier.obj: glut_modifier.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_overlay.obj: glut_overlay.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_shapes.obj: glut_shapes.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_space.obj: glut_space.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_swap.obj: glut_swap.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_swidth.obj: glut_swidth.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_tablet.obj: glut_tablet.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_teapot.obj: glut_teapot.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_util.obj: glut_util.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_vidresize.obj: glut_vidresize.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_warp.obj: glut_warp.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
-glut_win.obj: glut_win.c glutint.h glut.h glutos2.h
-glut_winmisc.obj: glut_winmisc.c glutint.h glut.h glutos2.h os2_glx.h os2_x11.h
 
 $(TARGET).lrf: makefile
-   @echo Creating file <<$(@B).lrf
+    @echo Creating file <<$(@B).lrf
 $(OBJS)
 /OUT:$(TARGET).DLL /DLL
@@ -125,6 +65,27 @@
 <<keep
 
+
+$(TARGET).lib: $(TARGET)exp.def
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
+
+$(TARGET)exp.def: $(TARGET).def
+    $(IMPDEF) $** $@
+
+
+resource.asm: $(TARGET).rc
+    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+
+
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+        *.c *.cpp *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
+
 clean:
-        $(RM) *.obj *.lib *.dll *.map *.lrf *exp.def resource.asm
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.lrf *exp.def resource.asm \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib
Index: trunk/src/opengl/makefile
===================================================================
--- trunk/src/opengl/makefile	(revision 2707)
+++ trunk/src/opengl/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.5 2000-02-09 13:44:31 sandervl Exp $
+# $Id: makefile,v 1.6 2000-02-09 23:40:50 bird Exp $
 #
 # PD-Win32 API
@@ -42,22 +42,22 @@
 
 $(TARGET1).dll: $(OBJS1) $(TARGET1).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS1) $(TARGET1).def \
-              $(PDWIN32_LIB)/gdi32.lib $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-              OS2386.LIB $(RTLLIB_O)
-        $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS1) $(TARGET1).def \
+          $(PDWIN32_LIB)/gdi32.lib $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
+          OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
 $(TARGET1).lib: $(TARGET1)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET1)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET1)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET1)exp.def: $(TARGET1).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
+
 
 resource.asm: $(TARGET1).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET1).rc
 
-resource.obj: resource.asm
 
 $(TARGET2).dll:
@@ -71,15 +71,51 @@
     cd ..
 
-opengl32.obj: opengl32.cpp pglos2.h glos2.h initterm.h
-initterm.obj: initterm.cpp initterm.h
+
+$(TARGET2).lib:
+    cd glu
+    $(MAKE_CMD) $(@F)
+    cd ..
+
+
+$(TARGET3).lib:
+    cd glut
+    $(MAKE_CMD) $(@F)
+    cd ..
+
+
+lib: $(TARGET1).lib $(PDWIN32_LIB)\$(TARGET1).lib \
+     $(TARGET2).lib $(PDWIN32_LIB)\$(TARGET2).lib \
+     $(TARGET3).lib $(PDWIN32_LIB)\$(TARGET3).lib
+
+$(PDWIN32_LIB)\$(TARGET1).lib: $(TARGET1).lib
+    $(CP) $** $@
+
+$(PDWIN32_LIB)\$(TARGET2).lib: $(TARGET2).lib
+    $(CP) $** $@
+
+$(PDWIN32_LIB)\$(TARGET3).lib: $(TARGET3).lib
+    $(CP) $** $@
+
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+    cd glut
+    $(MAKE_CMD) NODEP=1 dep
+    cd ..\glu
+    $(MAKE_CMD) NODEP=1 dep
+    cd ..
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-        $(RM) *.obj *.lib *.dll *.map resource.asm *exp.def
-        $(RM) $(PDWIN32_BIN)\$(TARGET1).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET1).lib
-        cd glut
-        $(MAKE_CMD) clean
-        cd ..\glu
-        $(MAKE_CMD) clean
-        cd ..
+    $(RM) *.obj *.lib *.dll *.map resource.asm *exp.def \
+        $(RM) $(PDWIN32_BIN)\$(TARGET1).dll $(PDWIN32_LIB)\$(TARGET1).lib \
+    cd glut
+    $(MAKE_CMD) clean
+    cd ..\glu
+    $(MAKE_CMD) clean
+    cd ..
 
Index: trunk/src/peldr/makefile
===================================================================
--- trunk/src/peldr/makefile	(revision 2707)
+++ trunk/src/peldr/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.12 2000-01-30 14:48:51 sandervl Exp $
+# $Id: makefile,v 1.13 2000-02-09 23:40:52 bird Exp $
 
 #
@@ -10,5 +10,5 @@
 PDWIN32_LIB = ..\..\lib
 PDWIN32_BIN = ..\..\bin
-
+PDWIN32_TOOLS = ..\..\tools\bin
 
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
@@ -17,5 +17,5 @@
 CXXFLAGS = $(CXXFLAGS) /Ge+ -I$(PDWIN32_INCLUDE) -Gn-
 LDFLAGS  = $(LDFLAGS_ODINCRT) /Ge+ /B"/pmtype:pm /stack:0x100000 /NOBASE /Map" \
-             os2386.lib
+           os2386.lib
 
 
@@ -28,12 +28,20 @@
 
 $(TARGET).exe: $(OBJS) makefile
-        $(LD) $(LDFLAGS) -Fe$@ $(OBJS)
-        $(CP) $(TARGET).exe $(PDWIN32_BIN)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fe$@ $(OBJS)
+    $(CP) $(TARGET).exe $(PDWIN32_BIN)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
-pe.obj: pe.cpp pe.h $(PDWIN32_INCLUDE)\winimagebase.h $(PDWIN32_INCLUDE)\winexebase.h
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-        $(RM) *.obj *.lib *.dll *.map *.pch *.exe
-        $(RM) $(PDWIN32_BIN)\$(TARGET).exe
+    $(RM) *.obj *.lib *.dll *.map *.pch *.exe \
+        $(PDWIN32_BIN)\$(TARGET).exe
+
Index: trunk/src/psapi/makefile
===================================================================
--- trunk/src/psapi/makefile	(revision 2707)
+++ trunk/src/psapi/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.5 2000-02-05 02:09:24 sandervl Exp $
+# $Id: makefile,v 1.6 2000-02-09 23:40:53 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	psapi.dll makefile
+#       psapi.dll makefile
 #
 
@@ -28,28 +28,39 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-psapi.obj: psapi.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
 
Index: trunk/src/rasapi32/makefile
===================================================================
--- trunk/src/rasapi32/makefile	(revision 2707)
+++ trunk/src/rasapi32/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.6 2000-02-05 02:09:55 sandervl Exp $
+# $Id: makefile,v 1.7 2000-02-09 23:40:53 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	rasapi32.dll makefile
+#       rasapi32.dll makefile
 #
 
@@ -28,16 +28,21 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 
@@ -45,11 +50,18 @@
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
-rasapi32.obj: rasapi32.cpp
+
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
 
@@ -57,2 +69,3 @@
 
 
+
Index: trunk/src/shell32/makefile
===================================================================
--- trunk/src/shell32/makefile	(revision 2707)
+++ trunk/src/shell32/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.19 2000-02-05 02:10:16 sandervl Exp $
+# $Id: makefile,v 1.20 2000-02-09 23:40:53 bird Exp $
 
 #
@@ -34,59 +34,42 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/advapi32.lib \
-              $(PDWIN32_LIB)/gdi32.lib $(PDWIN32_LIB)/ole32.lib  \
-              $(PDWIN32_LIB)/version.lib $(PDWIN32_LIB)/comctl32.lib   \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-        $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/advapi32.lib \
+          $(PDWIN32_LIB)/gdi32.lib $(PDWIN32_LIB)/ole32.lib  \
+          $(PDWIN32_LIB)/version.lib $(PDWIN32_LIB)/comctl32.lib   \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
+
 
 resource.asm: shres.rc shell32_en.rc
     $(RC) $(RCFLAGS) -o resource.asm shres.rc
 
-resource.obj: resource.asm
+
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
 
 
-initterm.obj:     initterm.cpp $(PDWIN32_INCLUDE)\exitlist.h
-brsfolder.obj:    brsfolder.cpp
-classes.obj:      classes.cpp
-contmenu.obj:     contmenu.cpp
-dataobject.obj:   dataobject.cpp
-enumidlist.obj:   enumidlist.cpp
-folders.obj:      folders.cpp
-iconcache.obj:    iconcache.cpp
-memorystream.obj: memorystream.cpp
-pidl.obj:         pidl.cpp
-regstream.obj:    regstream.cpp
-shell32_main.obj: shell32_main.cpp
-shell.obj:        shell.cpp
-shellguid.obj:    shellguid.cpp
-shelllink.obj:    shelllink.cpp
-shlmenu.obj:      shlmenu.cpp
-shellole.obj:     shellole.cpp
-shellord.obj:     shellord.cpp
-shellpath.obj:    shellpath.cpp
-shlfolder.obj:    shlfolder.cpp
-shlview.obj:      shlview.cpp
-shv_bg_cmenu.obj: shv_bg_cmenu.cpp
-unknown.obj:      unknown.cpp
-misc.obj:         misc.cpp
-she.obj:          she.cpp
-sh.obj:           sh.cpp
-shpolicy.obj:     shpolicy.cpp shpolicy.h
+clean:
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
-clean:
-        $(RM) *.obj *.lib *.dll *.map *.pch
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
-
-
-
Index: trunk/src/shlwapi/makefile
===================================================================
--- trunk/src/shlwapi/makefile	(revision 2707)
+++ trunk/src/shlwapi/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.7 2000-02-05 02:10:50 sandervl Exp $
+# $Id: makefile,v 1.8 2000-02-09 23:40:53 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	shlwapi.dll makefile
+#       shlwapi.dll makefile
 #
 
@@ -28,16 +28,21 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-	      $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/shell32.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/shell32.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 
@@ -45,15 +50,17 @@
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-shlwapi.obj: shlwapi.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
-
-
-
-
Index: trunk/src/tapi32/makefile
===================================================================
--- trunk/src/tapi32/makefile	(revision 2707)
+++ trunk/src/tapi32/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.10 2000-02-05 02:11:22 sandervl Exp $
+# $Id: makefile,v 1.11 2000-02-09 23:40:53 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	tapi32.dll makefile
+#       tapi32.dll makefile
 #
 
@@ -28,18 +28,22 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-              OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
+          OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
-
+    $(IMPDEF) $** $@
 
 
@@ -47,13 +51,18 @@
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-tapi32.obj: tapi32.cpp tapi32.h
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
 
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib
+        resource.asm $(TARGET)exp.def
 
 
Index: trunk/src/twain_32/makefile
===================================================================
--- trunk/src/twain_32/makefile	(revision 2707)
+++ trunk/src/twain_32/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.2 2000-01-26 23:48:54 sandervl Exp $
+# $Id: makefile,v 1.3 2000-02-09 23:40:54 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	twain_32.dll makefile
+#       twain_32.dll makefile
 #
 
@@ -19,11 +19,8 @@
 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) -DWIN32
 
-RC = $(PDWIN32_TOOLS)\wrc
-RCFLAGS = -s -I. -I$(CPPMAIN)\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
-
 
 TARGET = twain_32
 
-OBJS =  twain_32.obj initterm.obj resource.obj
+OBJS =   twain_32.obj initterm.obj resource.obj
 
 
@@ -32,31 +29,41 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
+
+
+resource.asm: twain_32.rc
+    $(RC) $(RCFLAGS) -o resource.asm twain_32.rc
+
+
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
+
+clean:
+    $(RM) *.obj *.lib *.dll *.map *.pch resource.asm \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        $(TARGET)exp.def
 
 
 
-
-resource.asm: twain_32.rc
-  $(RC) $(RCFLAGS) -o resource.asm twain_32.rc
-resource.obj: resource.asm
-twain_32.obj: twain_32.cpp
-initterm.obj: initterm.cpp
-
-clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch resource.asm
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
-
-
-
Index: trunk/src/user32/Makefile
===================================================================
--- trunk/src/user32/Makefile	(revision 2707)
+++ trunk/src/user32/Makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: Makefile,v 1.62 2000-02-05 14:08:52 sandervl Exp $
+# $Id: Makefile,v 1.63 2000-02-09 23:40:54 bird Exp $
 
 #
@@ -71,10 +71,16 @@
 <<keep
 
+
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 
@@ -82,85 +88,17 @@
     $(RC) $(RCFLAGS) -o resource.asm user32.rc
 
-resource.obj: resource.asm
 
-user32.obj: user32.cpp $(PDWIN32_INCLUDE)\winicon.h syscolor.h pmwindow.h
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-char.obj: char.cpp user32.h
-loadres.obj: loadres.cpp user32.h dib.h
-icon.obj: icon.cpp $(PDWIN32_INCLUDE)\winicon.h
-syscolor.obj: syscolor.cpp syscolor.h
-dde.obj: dde.cpp
-hook.obj: hook.cpp $(PDWIN32_INCLUDE)\win\hook.h
-defwndproc.obj: defwndproc.cpp syscolor.h win32wmdiclient.h win32wbase.h win32wnd.h win32dlg.h
-initterm.obj: initterm.cpp $(PDWIN32_INCLUDE)\spy.h pmwindow.h initterm.h $(PDWIN32_INCLUDE)\exitlist.h
-uitools.obj: uitools.cpp win32wbase.h
-unknown.obj: unknown.cpp
-wndmsg.obj: wndmsg.cpp wndmsg.h $(PDWIN32_INCLUDE)\spy.h
+!ifndef NODEP
+!include .depend
+!endif
 
-spy.obj: spy.cpp $(PDWIN32_INCLUDE)\spy.h
-
-controls.obj: controls.cpp controls.h win32wmdiclient.h win32dlg.h win32wdesktop.h
-button.obj: button.cpp $(PDWIN32_INCLUDE)\win\button.h initterm.h
-static.obj: static.cpp $(PDWIN32_INCLUDE)\win\static.h initterm.h
-scroll.obj: scroll.cpp $(PDWIN32_INCLUDE)\win\scroll.h win32wbase.h oslibwin.h
-listbox.obj: listbox.cpp $(PDWIN32_INCLUDE)\win\combo.h
-combo.obj: combo.cpp $(PDWIN32_INCLUDE)\win\combo.h initterm.h
-edit.obj: edit.cpp $(PDWIN32_INCLUDE)\win\combo.h
-menu.obj: menu.cpp $(PDWIN32_INCLUDE)\win\menu.h
-winswitch.obj: winswitch.cpp $(PDWIN32_INCLUDE)\win\winswitch.h
-icontitle.obj: icontitle.cpp $(PDWIN32_INCLUDE)\win\icontitle.h
-
-msgbox.obj:    msgbox.c
-window.obj:    window.cpp win32class.h win32wbase.h win32wndchild.h oslibwin.h win32wmdiclient.h win32wdesktop.h
-windowmsg.obj: windowmsg.cpp win32class.h win32wbase.h win32wndchild.h oslibmsg.h
-winprop.obj:   winprop.cpp win32wbase.h
-wingdi.obj:    wingdi.cpp win32wbase.h oslibgdi.h
-windowclass.obj: windowclass.cpp win32class.h win32wbase.h win32wndchild.h
-windowword.obj:  windowword.cpp win32class.h win32wbase.h win32dlg.h win32wndchild.h
-winaccel.obj:     winaccel.cpp  $(PDWIN32_INCLUDE)\winres.h win32wbase.h
-winicon.obj:    winicon.cpp $(PDWIN32_INCLUDE)\winicon.h win32wbase.h
-windlg.obj:    windlg.cpp win32wbase.h win32dlg.h
-windlgmsg.obj: windlgmsg.cpp win32class.h win32wbase.h win32dlg.h win32wndchild.h
-win32wndhandle.obj: win32wndhandle.cpp win32wndhandle.h
-
-pmwindow.obj:   pmwindow.cpp win32class.h win32wbase.h win32dlg.h pmwindow.h win32wndchild.h $(PDWIN32_INCLUDE)\wprocess.h oslibgdi.h oslibwin.h dc.h $(PDWIN32_INCLUDE)\win\thread.h
-pmframe.obj: pmframe.cpp win32class.h win32wbase.h pmframe.h win32wndchild.h
-win32class.obj: win32class.cpp win32class.h win32wbase.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h $(PDWIN32_INCLUDE)\win\winproc.h
-win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h pmframe.h win32wdesktop.h controls.h winmouse.h $(PDWIN32_INCLUDE)\win\winproc.h $(PDWIN32_INCLUDE)\win\hook.h oslibmsg.h
-win32wbasenonclient.obj:   win32wbasenonclient.cpp win32class.h win32wbase.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h controls.h oslibmsg.h pmframe.h
-win32wbasepos.obj: win32wbasepos.cpp win32class.h win32wbase.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h pmframe.h win32wdesktop.h
-win32wnd.obj:   win32wnd.cpp win32class.h win32wbase.h win32wnd.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h
-win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h oslibmsg.h controls.h $(PDWIN32_INCLUDE)\win\winproc.h
-win32wndchild.obj: win32wndchild.cpp win32wndchild.h gen_object.h
-win32wmdiclient.obj: win32wmdiclient.cpp win32wbase.h win32wmdiclient.h win32wmdichild.h gen_object.h
-win32wmdichild.obj: win32wmdichild.cpp win32wbase.h win32wmdiclient.h win32wmdichild.h gen_object.h
-win32wdesktop.obj: win32wdesktop.cpp win32wbase.h win32wdesktop.h gen_object.h
-gen_object.obj: gen_object.cpp gen_object.h $(PDWIN32_INCLUDE)\heapshared.h
-oslibwin.obj:   oslibwin.cpp oslibwin.h oslibutil.h oslibgdi.h $(PDWIN32_INCLUDE)\winconst.h
-oslibutil.obj:  oslibutil.cpp oslibutil.h $(PDWIN32_INCLUDE)\wprocess.h oslibmsg.h
-oslibmsg.obj:   oslibmsg.cpp oslibmsg.h timer.h win32wbase.h win32wnd.h $(PDWIN32_INCLUDE)\win\thread.h
-oslibmsgtranslate.obj: oslibmsgtranslate.cpp oslibmsg.h timer.h win32wbase.h win32wnd.h $(PDWIN32_INCLUDE)\win\thread.h win32wdesktop.h
-oslibgdi.obj:   oslibgdi.cpp oslibgdi.h win32wbase.h
-oslibres.obj:   oslibres.cpp oslibwin.h oslibres.h $(PDWIN32_INCLUDE)\winconst.h
-oslibdos.obj:   oslibdos.cpp oslibdos.h
-dc.obj:         dc.cpp win32wbase.h dc.h $(PDWIN32_INCLUDE)\dcdata.h
-timer.obj:      timer.cpp win32wbase.h timer.h
-caret.obj:      caret.cpp win32wbase.h caret.h $(PDWIN32_INCLUDE)\dcdata.h
-text.obj:       text.cpp
-
-clipboard.obj:  clipboard.cpp win32wbase.h
-dib.obj:        dib.cpp dib.h
-wsprintf.obj:   wsprintf.cpp
-
-winmouse.obj:   winmouse.cpp winmouse.h oslibmsg.h pmwindow.h win32wbase.h
-winkeyboard.obj: winkeyboard.cpp $(PDWIN32_INCLUDE)\winkeyboard.h
-display.obj: display.cpp pmwindow.h
-
-winproc.obj: winproc.cpp $(PDWIN32_INCLUDE)\win\winproc.h $(PDWIN32_INCLUDE)\heapcode.h win32wbase.h
 
 clean:
-        $(RM) *.obj *.lib *.dll *.map *.pch *.res *.lrf resource.asm *.lrf
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
-        $(RM) $(TARGET)exp.def
+    $(RM) *.obj *.lib *.dll *.map *.pch *.res *.lrf resource.asm *.lrf \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        $(TARGET)exp.def
 
Index: trunk/src/version/makefile
===================================================================
--- trunk/src/version/makefile	(revision 2707)
+++ trunk/src/version/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.10 2000-02-05 02:13:02 sandervl Exp $
+# $Id: makefile,v 1.11 2000-02-09 23:40:54 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	version.dll makefile
+#       version.dll makefile
 #
 
@@ -28,36 +28,42 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def $(TARGET)exp.def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-              $(PDWIN32_LIB)/crtdll.lib \
-              $(PDWIN32_LIB)/lz32.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
+          $(PDWIN32_LIB)/crtdll.lib \
+          $(PDWIN32_LIB)/lz32.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
-$(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
 
 $(TARGET).lib: $(TARGET)exp.def
-	$(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-	$(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
+
+$(TARGET)exp.def: $(TARGET).def
+    $(IMPDEF) $** $@
+
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
+
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
 
 
-version.obj: version.cpp
-install.obj: install.c
-info.obj: info.c
+clean:
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
-clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch	
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
-
-
-
-
-
Index: trunk/src/win32k/Makefile
===================================================================
--- trunk/src/win32k/Makefile	(revision 2707)
+++ trunk/src/win32k/Makefile	(revision 2709)
@@ -1,4 +1,4 @@
 ################################################################################
-# $Id: Makefile,v 1.20 2000-02-01 08:07:26 bird Exp $
+# $Id: Makefile,v 1.21 2000-02-09 23:40:54 bird Exp $
 #
 # Copyright 1998-1999 knut st. osmundsen
@@ -276,10 +276,6 @@
 #                asm deps must be updated by hand
 ################################################################################
-depend: fastdep.exe
-    fastdep -oObject $(CINCLUDES) misc\*.c* ldr\*.c* dev32\*.c* dev16\*.c* pe2lx\*.c* include\*.h
-
-fastdep.exe: fastdep.c
-    @$(ECHO) making fastdep.exe
-    @icc -Q+ -Ti+ fastdep.c
+dep:
+    $(PDWIN32_TOOLS)\fastdep -oObject $(CINCLUDES) misc\*.c* ldr\*.c* dev32\*.c* dev16\*.c* pe2lx\*.c* include\*.h
 
 object\asmutils.obj:            misc\asmutils.asm     include\devsegdf.inc
@@ -289,3 +285,5 @@
 object\devlast.obj:             dev32\devlast.asm     include\devsegdf.inc
 
-!include .depend
+!ifndef NODEP
+!include .dep
+!endif
Index: trunk/src/win32k/configure.cmd
===================================================================
--- trunk/src/win32k/configure.cmd	(revision 2707)
+++ trunk/src/win32k/configure.cmd	(revision 2709)
@@ -1,3 +1,3 @@
-/* $Id: configure.cmd,v 1.3 1999-11-10 01:45:29 bird Exp $
+/* $Id: configure.cmd,v 1.4 2000-02-09 23:40:54 bird Exp $
  *
  * Configuration script.
@@ -41,4 +41,5 @@
         call lineout sIncFile, 'PDWIN32_BIN      =' sPDWin32Base'\bin'
         call lineout sIncFile, 'PDWIN32_LIB      =' sPDWin32Base'\lib'
+        call lineout sIncFile, 'PDWIN32_TOOLS    =' sPDWin32Base'\tools\bin'
         call lineout sIncFile, ''
 
Index: trunk/src/win32k/pe2lx/makefile
===================================================================
--- trunk/src/win32k/pe2lx/makefile	(revision 2707)
+++ trunk/src/win32k/pe2lx/makefile	(revision 2709)
@@ -1,4 +1,4 @@
 ##############################################################################
-# $Id: makefile,v 1.16 2000-02-01 07:26:50 bird Exp $
+# $Id: makefile,v 1.17 2000-02-09 23:40:55 bird Exp $
 #
 # PD-Win32 API
@@ -14,4 +14,5 @@
 PDWIN32_LIB     = ..\..\..\lib
 PDWIN32_BIN     = ..\..\..\bin
+PDWIN32_TOOLS   = ..\..\..\tools\bin
 PE2LXOBJ        = ..\object
 PE2LXLIST       = ..\list
@@ -20,5 +21,5 @@
 WIN32K_MISC     = $(WIN32KBASE)\misc
 WIN32K_LDR      = $(WIN32KBASE)\ldr
-OBJEXT = pe_obj
+OBJEXT          = pe_obj
 
 ##############################################################################
@@ -108,7 +109,5 @@
 
 
-#all: $(TARGET).exe
-all: depend
-    $(MAKE) /nologo DEPENDEXISTS=1 $(TARGET).exe
+all: $(TARGET).exe
 
 $(TARGET).exe: $(OBJS)
@@ -118,12 +117,10 @@
 
 
-..\fastdep.exe:
-    @cd ..
-    @$(ECHO) making fastdep.exe
-    @icc -Q+ -Ti+ fastdep.c
-    @cd pe2lx
+dep:
+    $(DEPEND) -obj$(OBJEXT) -o..\Object $(CINCLUDES) ..\misc\*.c* ..\include\*.h
 
-depend: ..\fastdep.exe
-    ..\fastdep.exe -obj$(OBJEXT) -o..\Object $(CINCLUDES) ..\misc\*.c* ..\include\*.h
+!ifndef NODEP
+!include .depend
+!endif
 
 ##############################################################################
@@ -135,5 +132,3 @@
 
 
-!ifdef DEPENDEXISTS
-!include .depend
-!endif
+
Index: trunk/src/wing32/makefile
===================================================================
--- trunk/src/wing32/makefile	(revision 2707)
+++ trunk/src/wing32/makefile	(revision 2709)
@@ -1,2 +1,4 @@
+# $Id: makefile,v 1.5 2000-02-09 23:40:55 bird Exp $
+
 #
 # PD-Win32 API
@@ -28,9 +30,13 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def $(LIBS)
-  $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def $(LIBS)
+    $(CP) $@ $(PDWIN32_BIN)
 
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+
+
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
 
 $(TARGET).lib: $(TARGET)exp.Def
@@ -38,9 +44,6 @@
     $(CP) $@ $(PDWIN32_LIB)\$@
 
-
-wing32.obj: wing32.cpp\
-    wing32impl.h\
-    $(PDWIN32_INCLUDE)\win\wingdi.h \
-    $(PDWIN32_INCLUDE)\win\winuser.h
+$(TARGET)exp.def: $(TARGET).def
+    $(IMPDEF) $** $@
 
 
@@ -48,10 +51,17 @@
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-initterm.obj: initterm.cpp wing32impl.h
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-  $(RM) *.obj *.lib *.dll *.map *.pch
-  $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-  $(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
+
Index: trunk/src/wininet/makefile
===================================================================
--- trunk/src/wininet/makefile	(revision 2707)
+++ trunk/src/wininet/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.3 2000-02-05 02:14:10 sandervl Exp $
+# $Id: makefile,v 1.4 2000-02-09 23:40:55 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	mpr.dll makefile
+#       mpr.dll makefile
 #
 
@@ -28,31 +28,39 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-              $(PDWIN32_LIB)/wsock32.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
+          $(PDWIN32_LIB)/wsock32.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-wininet.obj: wininet.cpp
-ftp.obj: ftp.c internet.h
-utility.obj: utility.c internet.h
-internet.obj: internet.c internet.h
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *exp.def *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *exp.def *.map *.pch
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
Index: trunk/src/winmm/makefile
===================================================================
--- trunk/src/winmm/makefile	(revision 2707)
+++ trunk/src/winmm/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.13 2000-02-05 02:16:21 sandervl Exp $
+# $Id: makefile,v 1.14 2000-02-09 23:40:55 bird Exp $
 
 #
@@ -32,19 +32,24 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/pmwinx.lib mmpm2.lib  \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-              OS2386.LIB \
-              $(RTLLIB_O)
-        $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/pmwinx.lib mmpm2.lib  \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
+          OS2386.LIB \
+          $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
-$(TARGET).LIB: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
+$(TARGET).lib: $(TARGET)exp.def
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
 
 
@@ -52,28 +57,16 @@
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-driver.obj:     driver.cpp
-os2timer.obj:   os2timer.cpp os2timer.h time.h
-waveout.obj:    waveout.cpp  dwaveout.h
-wavein.obj:     wavein.cpp
-mixer.obj:      mixer.cpp  midi.hpp
-mci.obj:        mci.cpp
-joy.obj:        joy.cpp joyos2.h
-mmio.obj:       mmio.cpp
-auxiliary.obj:  auxiliary.cpp  auxiliary.h
-auxos2.obj:     auxos2.cpp auxiliary.h
-midi.obj:       midi.cpp midi.hpp  irtmidi.hpp
-midistrm.obj:   midistrm.cpp midi.hpp   irtmidi.hpp
-irtmidi.obj:    irtmidi.cpp irtmidi.hpp
-dwaveout.obj:   dwaveout.cpp dwaveout.h $(PDWIN32_INCLUDE)\vmutex.h
-time.obj:       time.cpp
-initterm.obj:   initterm.cpp auxiliary.h
-playsound.obj:  playsound.cpp
-joyos2.obj:     joyos2.cpp joyos2.h
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-        $(RM) *.obj *.lib *.dll *.map *.pch
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
-
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
Index: trunk/src/winspool/makefile
===================================================================
--- trunk/src/winspool/makefile	(revision 2707)
+++ trunk/src/winspool/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.10 2000-02-05 02:17:11 sandervl Exp $
+# $Id: makefile,v 1.11 2000-02-09 23:40:56 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	winspool.dll makefile
+#       winspool.dll makefile
 #
 
@@ -28,29 +28,39 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/pmwinx.lib \
-              $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-              OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/pmwinx.lib \
+          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
+          OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
+
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-winspool.obj: winspool.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
+!ifndef NODEP
+!include .depend
+!endif
 
 
 clean:
-	$(RM) *.obj *.lib *.dll *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
Index: trunk/src/wnaspi32/makefile
===================================================================
--- trunk/src/wnaspi32/makefile	(revision 2707)
+++ trunk/src/wnaspi32/makefile	(revision 2709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.5 2000-02-05 02:17:42 sandervl Exp $
+# $Id: makefile,v 1.6 2000-02-09 23:40:56 bird Exp $
 
 #
@@ -27,32 +27,43 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
-              $(PDWIN32_LIB)/advapi32.lib
-        $(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
+          $(PDWIN32_LIB)/advapi32.lib
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
+
 $(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-        $(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
+    $(IMPDEF) $** $@
+
 
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-ainaspi32.obj: wnaspi32.cpp odinaspi.h srbos2.h
-odinaspi.obj:  odinaspi.cpp odinaspi.h srbos2.h
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
+
 clean:
-        $(RM) *.obj *.lib *.dll *~ *.map *.pch
-        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
-        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *~ *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
 
 
 
-
Index: trunk/src/wnetap32/makefile
===================================================================
--- trunk/src/wnetap32/makefile	(revision 2707)
+++ trunk/src/wnetap32/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.9 2000-02-05 02:19:02 sandervl Exp $
+# $Id: makefile,v 1.10 2000-02-09 23:40:56 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	wnetap32.dll makefile
+#       wnetap32.dll makefile
 #
 
@@ -29,29 +29,40 @@
 
 $(TARGET).dll: $(OBJS) $(ORGTARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(ORGTARGET).def \
-              $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-              OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(ORGTARGET).def \
+          $(PDWIN32_LIB)/kernel32.lib \
+          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
+          OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
 
 
+lib: $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
+
+$(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
+    $(CP) $** $@
+
 $(ORGTARGET).lib: $(ORGTARGET)exp.def
-	$(IMPLIB) $(IMPLIBFLAGS) $@ $**
-	$(CP) $@ $(PDWIN32_LIB)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
+    $(CP) $@ $(PDWIN32_LIB)
 
 $(ORGTARGET)exp.def: $(ORGTARGET).def
     $(IMPDEF) $** $@
 
+
 resource.asm: $(ORGTARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(ORGTARGET).rc
 
-resource.obj: resource.asm
 
-wnetap32.obj: wnetap32.cpp
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
+
 
 clean:
-	$(RM) *.obj *.lib *.dll *~ *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+        $(RM) *.obj *.lib *.dll *~ *.map *.pch \
+            $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+            resource.asm $(ORGTARGET)exp.def
 
-
Index: trunk/src/wsock32/makefile
===================================================================
--- trunk/src/wsock32/makefile	(revision 2707)
+++ trunk/src/wsock32/makefile	(revision 2709)
@@ -1,8 +1,8 @@
-# $Id: makefile,v 1.16 2000-02-05 02:19:44 sandervl Exp $
+# $Id: makefile,v 1.17 2000-02-09 23:40:56 bird Exp $
 
 #
 # PD-Win32 API
 #
-#	wsock32.dll makefile
+#       wsock32.dll makefile
 #
 
@@ -27,9 +27,15 @@
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
-	$(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              pmwsock.lib $(PDWIN32_LIB)\kernel32.lib \
-              $(PDWIN32_LIB)\user32.lib  \
-              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-	$(CP) $@ $(PDWIN32_BIN)
+    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
+          pmwsock.lib $(PDWIN32_LIB)\kernel32.lib \
+          $(PDWIN32_LIB)\user32.lib  \
+          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+    $(CP) $@ $(PDWIN32_BIN)
+
+
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+    $(CP) $** $@
 
 $(TARGET).lib: $(TARGET)exp.def
@@ -40,17 +46,21 @@
     $(IMPDEF) $** $@
 
+
 resource.asm: $(TARGET).rc
     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
 
-resource.obj: resource.asm
 
-wsock32.obj: wsock32.cpp   relaywin.h wsock32.h
-unknown.obj: unknown.cpp   wsock32.h
-relaywin.obj: relaywin.cpp relaywin.h wsock32.h
+dep:
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
+
+!ifndef NODEP
+!include .depend
+!endif
 
 
 clean:
-	$(RM) *.obj *.lib *.dll *~ *.map *.pch
-	$(RM) $(PDWIN32_BIN)\$(TARGET).dll
-	$(RM) $(PDWIN32_LIB)\$(TARGET).lib
+    $(RM) *.obj *.lib *.dll *~ *.map *.pch \
+        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
+        resource.asm $(TARGET)exp.def
 
