Specify the complete source file list for a dll inside the main
makefile and get rid of the subdirectories makefiles.
diff --git a/Make.rules.in b/Make.rules.in
index 6dbd8c5..7497a82 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -101,10 +101,11 @@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
+sysconfdir = @sysconfdir@
+includedir = @includedir@/wine
dlldir = @libdir@/wine
prog_manext = 1
conf_manext = 5
-includedir = @includedir@/wine
CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
*.flc *.spec.c *.spec.def *.glue.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
diff --git a/configure b/configure
index 60fc401..ec9cee5 100755
--- a/configure
+++ b/configure
@@ -12815,6 +12815,8 @@
+ac_config_commands="$ac_config_commands controls"
+
ac_config_commands="$ac_config_commands dlls/ddraw/d3ddevice"
ac_config_commands="$ac_config_commands dlls/ddraw/dclipper"
@@ -12857,12 +12859,40 @@
ac_config_commands="$ac_config_commands dlls/winsock/tests"
+ac_config_commands="$ac_config_commands files"
+
+ac_config_commands="$ac_config_commands graphics"
+
+ac_config_commands="$ac_config_commands graphics/x11drv"
+
+ac_config_commands="$ac_config_commands if1632"
+
ac_config_commands="$ac_config_commands include/wine"
+ac_config_commands="$ac_config_commands loader"
+
+ac_config_commands="$ac_config_commands loader/ne"
+
+ac_config_commands="$ac_config_commands memory"
+
+ac_config_commands="$ac_config_commands misc"
+
+ac_config_commands="$ac_config_commands msdos"
+
+ac_config_commands="$ac_config_commands objects"
+
ac_config_commands="$ac_config_commands programs/regapi/tests"
ac_config_commands="$ac_config_commands programs/winetest/tests"
+ac_config_commands="$ac_config_commands relay32"
+
+ac_config_commands="$ac_config_commands scheduler"
+
+ac_config_commands="$ac_config_commands win32"
+
+ac_config_commands="$ac_config_commands windows"
+
MAKE_RULES=Make.rules
@@ -12873,7 +12903,7 @@
MAKE_PROG_RULES=programs/Makeprog.rules
-ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules programs/Makeprog.rules Makefile controls/Makefile debugger/Makefile dlls/Makefile dlls/advapi32/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/gdi/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msg711/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/netapi32/Makefile dlls/ntdll/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/user/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winspool/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile files/Makefile graphics/Makefile graphics/x11drv/Makefile if1632/Makefile include/Makefile library/Makefile libtest/Makefile loader/Makefile loader/ne/Makefile memory/Makefile misc/Makefile miscemu/Makefile msdos/Makefile objects/Makefile ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winhelp/Makefile programs/winver/Makefile relay32/Makefile scheduler/Makefile server/Makefile tools/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wrc/Makefile tsx11/Makefile unicode/Makefile win32/Makefile windows/Makefile"
+ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules programs/Makeprog.rules Makefile debugger/Makefile dlls/Makefile dlls/advapi32/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/gdi/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msg711/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/netapi32/Makefile dlls/ntdll/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/user/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winspool/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile library/Makefile libtest/Makefile miscemu/Makefile ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wrc/Makefile tsx11/Makefile unicode/Makefile"
cat >confcache <<\_ACEOF
@@ -13354,7 +13384,6 @@
"dlls/Makedll.rules" ) CONFIG_FILES="$CONFIG_FILES dlls/Makedll.rules" ;;
"programs/Makeprog.rules" ) CONFIG_FILES="$CONFIG_FILES programs/Makeprog.rules" ;;
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "controls/Makefile" ) CONFIG_FILES="$CONFIG_FILES controls/Makefile" ;;
"debugger/Makefile" ) CONFIG_FILES="$CONFIG_FILES debugger/Makefile" ;;
"dlls/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/Makefile" ;;
"dlls/advapi32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/advapi32/Makefile" ;;
@@ -13446,20 +13475,10 @@
"dlls/wsock32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/wsock32/Makefile" ;;
"dlls/x11drv/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/x11drv/Makefile" ;;
"documentation/Makefile" ) CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;;
- "files/Makefile" ) CONFIG_FILES="$CONFIG_FILES files/Makefile" ;;
- "graphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES graphics/Makefile" ;;
- "graphics/x11drv/Makefile" ) CONFIG_FILES="$CONFIG_FILES graphics/x11drv/Makefile" ;;
- "if1632/Makefile" ) CONFIG_FILES="$CONFIG_FILES if1632/Makefile" ;;
"include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"library/Makefile" ) CONFIG_FILES="$CONFIG_FILES library/Makefile" ;;
"libtest/Makefile" ) CONFIG_FILES="$CONFIG_FILES libtest/Makefile" ;;
- "loader/Makefile" ) CONFIG_FILES="$CONFIG_FILES loader/Makefile" ;;
- "loader/ne/Makefile" ) CONFIG_FILES="$CONFIG_FILES loader/ne/Makefile" ;;
- "memory/Makefile" ) CONFIG_FILES="$CONFIG_FILES memory/Makefile" ;;
- "misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES misc/Makefile" ;;
"miscemu/Makefile" ) CONFIG_FILES="$CONFIG_FILES miscemu/Makefile" ;;
- "msdos/Makefile" ) CONFIG_FILES="$CONFIG_FILES msdos/Makefile" ;;
- "objects/Makefile" ) CONFIG_FILES="$CONFIG_FILES objects/Makefile" ;;
"ole/Makefile" ) CONFIG_FILES="$CONFIG_FILES ole/Makefile" ;;
"programs/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/Makefile" ;;
"programs/avitools/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/avitools/Makefile" ;;
@@ -13482,8 +13501,6 @@
"programs/winetest/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/winetest/Makefile" ;;
"programs/winhelp/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/winhelp/Makefile" ;;
"programs/winver/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/winver/Makefile" ;;
- "relay32/Makefile" ) CONFIG_FILES="$CONFIG_FILES relay32/Makefile" ;;
- "scheduler/Makefile" ) CONFIG_FILES="$CONFIG_FILES scheduler/Makefile" ;;
"server/Makefile" ) CONFIG_FILES="$CONFIG_FILES server/Makefile" ;;
"tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
"tools/winapi/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/winapi/Makefile" ;;
@@ -13493,8 +13510,7 @@
"tools/wrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wrc/Makefile" ;;
"tsx11/Makefile" ) CONFIG_FILES="$CONFIG_FILES tsx11/Makefile" ;;
"unicode/Makefile" ) CONFIG_FILES="$CONFIG_FILES unicode/Makefile" ;;
- "win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
- "windows/Makefile" ) CONFIG_FILES="$CONFIG_FILES windows/Makefile" ;;
+ "controls" ) CONFIG_COMMANDS="$CONFIG_COMMANDS controls" ;;
"dlls/ddraw/d3ddevice" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/d3ddevice" ;;
"dlls/ddraw/dclipper" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/dclipper" ;;
"dlls/ddraw/ddraw" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/ddraw" ;;
@@ -13516,9 +13532,23 @@
"dlls/user/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/user/tests" ;;
"dlls/wineps/data" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/wineps/data" ;;
"dlls/winsock/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/winsock/tests" ;;
+ "files" ) CONFIG_COMMANDS="$CONFIG_COMMANDS files" ;;
+ "graphics" ) CONFIG_COMMANDS="$CONFIG_COMMANDS graphics" ;;
+ "graphics/x11drv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS graphics/x11drv" ;;
+ "if1632" ) CONFIG_COMMANDS="$CONFIG_COMMANDS if1632" ;;
"include/wine" ) CONFIG_COMMANDS="$CONFIG_COMMANDS include/wine" ;;
+ "loader" ) CONFIG_COMMANDS="$CONFIG_COMMANDS loader" ;;
+ "loader/ne" ) CONFIG_COMMANDS="$CONFIG_COMMANDS loader/ne" ;;
+ "memory" ) CONFIG_COMMANDS="$CONFIG_COMMANDS memory" ;;
+ "misc" ) CONFIG_COMMANDS="$CONFIG_COMMANDS misc" ;;
+ "msdos" ) CONFIG_COMMANDS="$CONFIG_COMMANDS msdos" ;;
+ "objects" ) CONFIG_COMMANDS="$CONFIG_COMMANDS objects" ;;
"programs/regapi/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS programs/regapi/tests" ;;
"programs/winetest/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS programs/winetest/tests" ;;
+ "relay32" ) CONFIG_COMMANDS="$CONFIG_COMMANDS relay32" ;;
+ "scheduler" ) CONFIG_COMMANDS="$CONFIG_COMMANDS scheduler" ;;
+ "win32" ) CONFIG_COMMANDS="$CONFIG_COMMANDS win32" ;;
+ "windows" ) CONFIG_COMMANDS="$CONFIG_COMMANDS windows" ;;
"include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -14154,6 +14184,8 @@
{ echo "$as_me:$LINENO: executing $ac_dest commands" >&5
echo "$as_me: executing $ac_dest commands" >&6;}
case $ac_dest in
+ controls ) test -d "controls" || ({ echo "$as_me:$LINENO: creating controls" >&5
+echo "$as_me: creating controls" >&6;} && mkdir "controls") ;;
dlls/ddraw/d3ddevice ) test -d "dlls/ddraw/d3ddevice" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/d3ddevice" >&5
echo "$as_me: creating dlls/ddraw/d3ddevice" >&6;} && mkdir "dlls/ddraw/d3ddevice") ;;
dlls/ddraw/dclipper ) test -d "dlls/ddraw/dclipper" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/dclipper" >&5
@@ -14196,12 +14228,40 @@
echo "$as_me: creating dlls/wineps/data" >&6;} && mkdir "dlls/wineps/data") ;;
dlls/winsock/tests ) test -d "dlls/winsock/tests" || ({ echo "$as_me:$LINENO: creating dlls/winsock/tests" >&5
echo "$as_me: creating dlls/winsock/tests" >&6;} && mkdir "dlls/winsock/tests") ;;
+ files ) test -d "files" || ({ echo "$as_me:$LINENO: creating files" >&5
+echo "$as_me: creating files" >&6;} && mkdir "files") ;;
+ graphics ) test -d "graphics" || ({ echo "$as_me:$LINENO: creating graphics" >&5
+echo "$as_me: creating graphics" >&6;} && mkdir "graphics") ;;
+ graphics/x11drv ) test -d "graphics/x11drv" || ({ echo "$as_me:$LINENO: creating graphics/x11drv" >&5
+echo "$as_me: creating graphics/x11drv" >&6;} && mkdir "graphics/x11drv") ;;
+ if1632 ) test -d "if1632" || ({ echo "$as_me:$LINENO: creating if1632" >&5
+echo "$as_me: creating if1632" >&6;} && mkdir "if1632") ;;
include/wine ) test -d "include/wine" || ({ echo "$as_me:$LINENO: creating include/wine" >&5
echo "$as_me: creating include/wine" >&6;} && mkdir "include/wine") ;;
+ loader ) test -d "loader" || ({ echo "$as_me:$LINENO: creating loader" >&5
+echo "$as_me: creating loader" >&6;} && mkdir "loader") ;;
+ loader/ne ) test -d "loader/ne" || ({ echo "$as_me:$LINENO: creating loader/ne" >&5
+echo "$as_me: creating loader/ne" >&6;} && mkdir "loader/ne") ;;
+ memory ) test -d "memory" || ({ echo "$as_me:$LINENO: creating memory" >&5
+echo "$as_me: creating memory" >&6;} && mkdir "memory") ;;
+ misc ) test -d "misc" || ({ echo "$as_me:$LINENO: creating misc" >&5
+echo "$as_me: creating misc" >&6;} && mkdir "misc") ;;
+ msdos ) test -d "msdos" || ({ echo "$as_me:$LINENO: creating msdos" >&5
+echo "$as_me: creating msdos" >&6;} && mkdir "msdos") ;;
+ objects ) test -d "objects" || ({ echo "$as_me:$LINENO: creating objects" >&5
+echo "$as_me: creating objects" >&6;} && mkdir "objects") ;;
programs/regapi/tests ) test -d "programs/regapi/tests" || ({ echo "$as_me:$LINENO: creating programs/regapi/tests" >&5
echo "$as_me: creating programs/regapi/tests" >&6;} && mkdir "programs/regapi/tests") ;;
programs/winetest/tests ) test -d "programs/winetest/tests" || ({ echo "$as_me:$LINENO: creating programs/winetest/tests" >&5
echo "$as_me: creating programs/winetest/tests" >&6;} && mkdir "programs/winetest/tests") ;;
+ relay32 ) test -d "relay32" || ({ echo "$as_me:$LINENO: creating relay32" >&5
+echo "$as_me: creating relay32" >&6;} && mkdir "relay32") ;;
+ scheduler ) test -d "scheduler" || ({ echo "$as_me:$LINENO: creating scheduler" >&5
+echo "$as_me: creating scheduler" >&6;} && mkdir "scheduler") ;;
+ win32 ) test -d "win32" || ({ echo "$as_me:$LINENO: creating win32" >&5
+echo "$as_me: creating win32" >&6;} && mkdir "win32") ;;
+ windows ) test -d "windows" || ({ echo "$as_me:$LINENO: creating windows" >&5
+echo "$as_me: creating windows" >&6;} && mkdir "windows") ;;
esac
done
_ACEOF
diff --git a/configure.ac b/configure.ac
index 0a34c06..438f244 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1243,6 +1243,7 @@
AH_TOP([#define __WINE_CONFIG_H])
+WINE_CONFIG_EXTRA_DIR(controls)
WINE_CONFIG_EXTRA_DIR(dlls/ddraw/d3ddevice)
WINE_CONFIG_EXTRA_DIR(dlls/ddraw/dclipper)
WINE_CONFIG_EXTRA_DIR(dlls/ddraw/ddraw)
@@ -1264,9 +1265,23 @@
WINE_CONFIG_EXTRA_DIR(dlls/user/tests)
WINE_CONFIG_EXTRA_DIR(dlls/wineps/data)
WINE_CONFIG_EXTRA_DIR(dlls/winsock/tests)
+WINE_CONFIG_EXTRA_DIR(files)
+WINE_CONFIG_EXTRA_DIR(graphics)
+WINE_CONFIG_EXTRA_DIR(graphics/x11drv)
+WINE_CONFIG_EXTRA_DIR(if1632)
WINE_CONFIG_EXTRA_DIR(include/wine)
+WINE_CONFIG_EXTRA_DIR(loader)
+WINE_CONFIG_EXTRA_DIR(loader/ne)
+WINE_CONFIG_EXTRA_DIR(memory)
+WINE_CONFIG_EXTRA_DIR(misc)
+WINE_CONFIG_EXTRA_DIR(msdos)
+WINE_CONFIG_EXTRA_DIR(objects)
WINE_CONFIG_EXTRA_DIR(programs/regapi/tests)
WINE_CONFIG_EXTRA_DIR(programs/winetest/tests)
+WINE_CONFIG_EXTRA_DIR(relay32)
+WINE_CONFIG_EXTRA_DIR(scheduler)
+WINE_CONFIG_EXTRA_DIR(win32)
+WINE_CONFIG_EXTRA_DIR(windows)
MAKE_RULES=Make.rules
AC_SUBST_FILE(MAKE_RULES)
@@ -1282,7 +1297,6 @@
dlls/Makedll.rules
programs/Makeprog.rules
Makefile
-controls/Makefile
debugger/Makefile
dlls/Makefile
dlls/advapi32/Makefile
@@ -1374,20 +1388,10 @@
dlls/wsock32/Makefile
dlls/x11drv/Makefile
documentation/Makefile
-files/Makefile
-graphics/Makefile
-graphics/x11drv/Makefile
-if1632/Makefile
include/Makefile
library/Makefile
libtest/Makefile
-loader/Makefile
-loader/ne/Makefile
-memory/Makefile
-misc/Makefile
miscemu/Makefile
-msdos/Makefile
-objects/Makefile
ole/Makefile
programs/Makefile
programs/avitools/Makefile
@@ -1410,8 +1414,6 @@
programs/winetest/Makefile
programs/winhelp/Makefile
programs/winver/Makefile
-relay32/Makefile
-scheduler/Makefile
server/Makefile
tools/Makefile
tools/winapi/Makefile
@@ -1420,9 +1422,7 @@
tools/wmc/Makefile
tools/wrc/Makefile
tsx11/Makefile
-unicode/Makefile
-win32/Makefile
-windows/Makefile])
+unicode/Makefile])
AC_OUTPUT
diff --git a/controls/.cvsignore b/controls/.cvsignore
index fac113f..72afefe 100644
--- a/controls/.cvsignore
+++ b/controls/.cvsignore
@@ -1,2 +1 @@
-Makefile
edit.glue.c
diff --git a/controls/Makefile.in b/controls/Makefile.in
deleted file mode 100644
index 8015432..0000000
--- a/controls/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-DEFS = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = controls
-EXTRAINCL = -I$(TOPSRCDIR)/dlls/user
-
-C_SRCS = \
- button.c \
- combo.c \
- desktop.c \
- edit.c \
- icontitle.c \
- listbox.c \
- menu.c \
- scroll.c \
- static.c \
- uitools.c
-
-GLUE = edit.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:
diff --git a/dlls/gdi/Makefile.in b/dlls/gdi/Makefile.in
index f52dfe5..16d6050 100644
--- a/dlls/gdi/Makefile.in
+++ b/dlls/gdi/Makefile.in
@@ -10,6 +10,30 @@
EXTRAINCL = @FREETYPEINCL@
C_SRCS = \
+ $(TOPOBJDIR)/graphics/bitblt.c \
+ $(TOPOBJDIR)/graphics/dispdib.c \
+ $(TOPOBJDIR)/graphics/env.c \
+ $(TOPOBJDIR)/graphics/escape.c \
+ $(TOPOBJDIR)/graphics/fontengine.c \
+ $(TOPOBJDIR)/graphics/mapping.c \
+ $(TOPOBJDIR)/graphics/painting.c \
+ $(TOPOBJDIR)/graphics/path.c \
+ $(TOPOBJDIR)/objects/bitmap.c \
+ $(TOPOBJDIR)/objects/brush.c \
+ $(TOPOBJDIR)/objects/clipping.c \
+ $(TOPOBJDIR)/objects/color.c \
+ $(TOPOBJDIR)/objects/dc.c \
+ $(TOPOBJDIR)/objects/dcvalues.c \
+ $(TOPOBJDIR)/objects/dib.c \
+ $(TOPOBJDIR)/objects/enhmetafile.c \
+ $(TOPOBJDIR)/objects/font.c \
+ $(TOPOBJDIR)/objects/gdiobj.c \
+ $(TOPOBJDIR)/objects/linedda.c \
+ $(TOPOBJDIR)/objects/metafile.c \
+ $(TOPOBJDIR)/objects/palette.c \
+ $(TOPOBJDIR)/objects/pen.c \
+ $(TOPOBJDIR)/objects/region.c \
+ $(TOPOBJDIR)/objects/text.c \
bidi16.c \
driver.c \
enhmfdrv/dc.c \
@@ -39,27 +63,23 @@
RC_SRCS16 = version16.rc
GLUE = \
+ $(TOPOBJDIR)/objects/dc.c \
+ $(TOPOBJDIR)/objects/font.c \
+ $(TOPOBJDIR)/objects/gdiobj.c \
+ $(TOPOBJDIR)/objects/linedda.c \
+ $(TOPOBJDIR)/objects/metafile.c \
printdrv.c \
win16drv/prtdrv.c
-EXTRA_OBJS = \
- $(TOPOBJDIR)/graphics/graphics.o \
- $(TOPOBJDIR)/objects/objects.o
-
-SUBDIRS = \
- $(TOPOBJDIR)/graphics \
- $(TOPOBJDIR)/objects
-
EXTRASUBDIRS = \
+ $(TOPOBJDIR)/graphics \
+ $(TOPOBJDIR)/objects \
enhmfdrv \
mfdrv \
win16drv
@MAKE_DLL_RULES@
-$(EXTRA_OBJS): dummy
- @cd `dirname $@` && $(MAKE) `basename $@`
-
# Special rules for 16-bit resource files
version16.res: version16.rc
diff --git a/dlls/ntdll/.cvsignore b/dlls/ntdll/.cvsignore
index 09083b5..628b5f6 100644
--- a/dlls/ntdll/.cvsignore
+++ b/dlls/ntdll/.cvsignore
@@ -1,3 +1,4 @@
Makefile
ntdll.spec.c
+relay16.s
relay32.s
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 57014e2..f5bc369 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_NTSYSTEM_
+EXTRADEFS = -D_NTSYSTEM_ -DBINDIR="\"$(bindir)\"" -DETCDIR="\"$(sysconfdir)\""
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
@@ -7,6 +7,92 @@
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
+ $(TOPOBJDIR)/files/change.c \
+ $(TOPOBJDIR)/files/directory.c \
+ $(TOPOBJDIR)/files/dos_fs.c \
+ $(TOPOBJDIR)/files/drive.c \
+ $(TOPOBJDIR)/files/file.c \
+ $(TOPOBJDIR)/files/profile.c \
+ $(TOPOBJDIR)/files/smb.c \
+ $(TOPOBJDIR)/files/tape.c \
+ $(TOPOBJDIR)/if1632/builtin.c \
+ $(TOPOBJDIR)/if1632/relay.c \
+ $(TOPOBJDIR)/if1632/snoop.c \
+ $(TOPOBJDIR)/loader/elf.c \
+ $(TOPOBJDIR)/loader/loadorder.c \
+ $(TOPOBJDIR)/loader/main.c \
+ $(TOPOBJDIR)/loader/module.c \
+ $(TOPOBJDIR)/loader/pe_image.c \
+ $(TOPOBJDIR)/loader/pe_resource.c \
+ $(TOPOBJDIR)/loader/resource.c \
+ $(TOPOBJDIR)/loader/task.c \
+ $(TOPOBJDIR)/loader/ne/convert.c \
+ $(TOPOBJDIR)/loader/ne/module.c \
+ $(TOPOBJDIR)/loader/ne/resource.c \
+ $(TOPOBJDIR)/loader/ne/segment.c \
+ $(TOPOBJDIR)/memory/atom.c \
+ $(TOPOBJDIR)/memory/codepage.c \
+ $(TOPOBJDIR)/memory/environ.c \
+ $(TOPOBJDIR)/memory/global.c \
+ $(TOPOBJDIR)/memory/heap.c \
+ $(TOPOBJDIR)/memory/instr.c \
+ $(TOPOBJDIR)/memory/local.c \
+ $(TOPOBJDIR)/memory/registry.c \
+ $(TOPOBJDIR)/memory/selector.c \
+ $(TOPOBJDIR)/memory/string.c \
+ $(TOPOBJDIR)/memory/virtual.c \
+ $(TOPOBJDIR)/misc/cpu.c \
+ $(TOPOBJDIR)/misc/error.c \
+ $(TOPOBJDIR)/misc/main.c \
+ $(TOPOBJDIR)/misc/options.c \
+ $(TOPOBJDIR)/misc/registry.c \
+ $(TOPOBJDIR)/misc/system.c \
+ $(TOPOBJDIR)/misc/version.c \
+ $(TOPOBJDIR)/msdos/dosconf.c \
+ $(TOPOBJDIR)/msdos/dosmem.c \
+ $(TOPOBJDIR)/msdos/dpmi.c \
+ $(TOPOBJDIR)/msdos/int11.c \
+ $(TOPOBJDIR)/msdos/int12.c \
+ $(TOPOBJDIR)/msdos/int13.c \
+ $(TOPOBJDIR)/msdos/int15.c \
+ $(TOPOBJDIR)/msdos/int1a.c \
+ $(TOPOBJDIR)/msdos/int20.c \
+ $(TOPOBJDIR)/msdos/int21.c \
+ $(TOPOBJDIR)/msdos/int25.c \
+ $(TOPOBJDIR)/msdos/int26.c \
+ $(TOPOBJDIR)/msdos/int2a.c \
+ $(TOPOBJDIR)/msdos/int2f.c \
+ $(TOPOBJDIR)/msdos/int3d.c \
+ $(TOPOBJDIR)/msdos/int41.c \
+ $(TOPOBJDIR)/msdos/int4b.c \
+ $(TOPOBJDIR)/msdos/int5c.c \
+ $(TOPOBJDIR)/msdos/interrupts.c \
+ $(TOPOBJDIR)/msdos/ioports.c \
+ $(TOPOBJDIR)/msdos/ppdev.c \
+ $(TOPOBJDIR)/msdos/vxd.c \
+ $(TOPOBJDIR)/ole/ole2nls.c \
+ $(TOPOBJDIR)/relay32/builtin32.c \
+ $(TOPOBJDIR)/relay32/relay386.c \
+ $(TOPOBJDIR)/relay32/snoop.c \
+ $(TOPOBJDIR)/scheduler/client.c \
+ $(TOPOBJDIR)/scheduler/critsection.c \
+ $(TOPOBJDIR)/scheduler/handle.c \
+ $(TOPOBJDIR)/scheduler/pipe.c \
+ $(TOPOBJDIR)/scheduler/process.c \
+ $(TOPOBJDIR)/scheduler/pthread.c \
+ $(TOPOBJDIR)/scheduler/synchro.c \
+ $(TOPOBJDIR)/scheduler/sysdeps.c \
+ $(TOPOBJDIR)/scheduler/syslevel.c \
+ $(TOPOBJDIR)/scheduler/thread.c \
+ $(TOPOBJDIR)/scheduler/timer.c \
+ $(TOPOBJDIR)/win32/console.c \
+ $(TOPOBJDIR)/win32/device.c \
+ $(TOPOBJDIR)/win32/editline.c \
+ $(TOPOBJDIR)/win32/except.c \
+ $(TOPOBJDIR)/win32/init.c \
+ $(TOPOBJDIR)/win32/kernel32.c \
+ $(TOPOBJDIR)/win32/newfns.c \
+ $(TOPOBJDIR)/win32/time.c \
cdrom.c \
critsection.c \
debugtools.c \
@@ -31,22 +117,16 @@
wcstring.c
GEN_ASM_SRCS = \
+ relay16.s \
relay32.s
-EXTRA_OBJS = \
- $(TOPOBJDIR)/files/files.o \
- $(TOPOBJDIR)/if1632/if1632.o \
- $(TOPOBJDIR)/loader/loader.o \
- $(TOPOBJDIR)/loader/ne/ne.o \
- $(TOPOBJDIR)/memory/memory.o \
- $(TOPOBJDIR)/misc/misc.o \
- $(TOPOBJDIR)/msdos/msdos.o \
- $(TOPOBJDIR)/ole/ole.o \
- $(TOPOBJDIR)/relay32/relay32.o \
- $(TOPOBJDIR)/scheduler/scheduler.o \
- $(TOPOBJDIR)/win32/win32.o
+GLUE = \
+ $(TOPOBJDIR)/loader/task.c \
+ $(TOPOBJDIR)/loader/ne/module.c \
+ $(TOPOBJDIR)/loader/ne/segment.c \
+ $(TOPOBJDIR)/memory/local.c
-SUBDIRS = \
+EXTRASUBDIRS = \
$(TOPOBJDIR)/files \
$(TOPOBJDIR)/if1632 \
$(TOPOBJDIR)/loader \
@@ -61,8 +141,8 @@
@MAKE_DLL_RULES@
-$(EXTRA_OBJS): dummy
- @cd `dirname $@` && $(MAKE) `basename $@`
+relay16.s: $(WINEBUILD)
+ $(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -relay16
relay32.s: $(WINEBUILD)
$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -relay32
diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in
index 6f62d9f..b0976ac 100644
--- a/dlls/user/Makefile.in
+++ b/dlls/user/Makefile.in
@@ -9,6 +9,49 @@
LDIMPORTS = gdi32.dll kernel32.dll ntdll.dll
C_SRCS = \
+ $(TOPOBJDIR)/controls/button.c \
+ $(TOPOBJDIR)/controls/combo.c \
+ $(TOPOBJDIR)/controls/desktop.c \
+ $(TOPOBJDIR)/controls/edit.c \
+ $(TOPOBJDIR)/controls/icontitle.c \
+ $(TOPOBJDIR)/controls/listbox.c \
+ $(TOPOBJDIR)/controls/menu.c \
+ $(TOPOBJDIR)/controls/scroll.c \
+ $(TOPOBJDIR)/controls/static.c \
+ $(TOPOBJDIR)/controls/uitools.c \
+ $(TOPOBJDIR)/windows/caret.c \
+ $(TOPOBJDIR)/windows/class.c \
+ $(TOPOBJDIR)/windows/clipboard.c \
+ $(TOPOBJDIR)/windows/cursoricon.c \
+ $(TOPOBJDIR)/windows/dce.c \
+ $(TOPOBJDIR)/windows/defdlg.c \
+ $(TOPOBJDIR)/windows/defwnd.c \
+ $(TOPOBJDIR)/windows/dialog.c \
+ $(TOPOBJDIR)/windows/driver.c \
+ $(TOPOBJDIR)/windows/focus.c \
+ $(TOPOBJDIR)/windows/hook.c \
+ $(TOPOBJDIR)/windows/input.c \
+ $(TOPOBJDIR)/windows/keyboard.c \
+ $(TOPOBJDIR)/windows/mdi.c \
+ $(TOPOBJDIR)/windows/message.c \
+ $(TOPOBJDIR)/windows/msgbox.c \
+ $(TOPOBJDIR)/windows/multimon.c \
+ $(TOPOBJDIR)/windows/nonclient.c \
+ $(TOPOBJDIR)/windows/painting.c \
+ $(TOPOBJDIR)/windows/queue.c \
+ $(TOPOBJDIR)/windows/rect.c \
+ $(TOPOBJDIR)/windows/scroll.c \
+ $(TOPOBJDIR)/windows/spy.c \
+ $(TOPOBJDIR)/windows/struct32.c \
+ $(TOPOBJDIR)/windows/syscolor.c \
+ $(TOPOBJDIR)/windows/sysmetrics.c \
+ $(TOPOBJDIR)/windows/sysparams.c \
+ $(TOPOBJDIR)/windows/timer.c \
+ $(TOPOBJDIR)/windows/user.c \
+ $(TOPOBJDIR)/windows/win.c \
+ $(TOPOBJDIR)/windows/winhelp.c \
+ $(TOPOBJDIR)/windows/winpos.c \
+ $(TOPOBJDIR)/windows/winproc.c \
bidi16.c \
cache.c \
comm16.c \
@@ -40,20 +83,18 @@
resources/version16.rc
GLUE = \
+ $(TOPOBJDIR)/controls/edit.c \
+ $(TOPOBJDIR)/windows/driver.c \
+ $(TOPOBJDIR)/windows/hook.c \
+ $(TOPOBJDIR)/windows/painting.c \
dde/ddeml16.c \
property.c \
text.c \
wnd16.c
-EXTRA_OBJS = \
- $(TOPOBJDIR)/controls/controls.o \
- $(TOPOBJDIR)/windows/windows.o
-
-SUBDIRS = \
- $(TOPOBJDIR)/controls \
- $(TOPOBJDIR)/windows
-
EXTRASUBDIRS = \
+ $(TOPOBJDIR)/controls \
+ $(TOPOBJDIR)/windows \
dde \
resources \
tests
@@ -65,9 +106,6 @@
@MAKE_DLL_RULES@
-$(EXTRA_OBJS): dummy
- @cd `dirname $@` && $(MAKE) `basename $@`
-
# Special rules for 16-bit resource files
resources/display.res: resources/display.rc
diff --git a/dlls/x11drv/Makefile.in b/dlls/x11drv/Makefile.in
index df0460d..945ccaf 100644
--- a/dlls/x11drv/Makefile.in
+++ b/dlls/x11drv/Makefile.in
@@ -9,6 +9,20 @@
LDIMPORTS = user32.dll gdi32.dll kernel32.dll
C_SRCS = \
+ $(TOPOBJDIR)/graphics/x11drv/bitblt.c \
+ $(TOPOBJDIR)/graphics/x11drv/bitmap.c \
+ $(TOPOBJDIR)/graphics/x11drv/brush.c \
+ $(TOPOBJDIR)/graphics/x11drv/clipping.c \
+ $(TOPOBJDIR)/graphics/x11drv/codepage.c \
+ $(TOPOBJDIR)/graphics/x11drv/dib.c \
+ $(TOPOBJDIR)/graphics/x11drv/graphics.c \
+ $(TOPOBJDIR)/graphics/x11drv/init.c \
+ $(TOPOBJDIR)/graphics/x11drv/objects.c \
+ $(TOPOBJDIR)/graphics/x11drv/opengl.c \
+ $(TOPOBJDIR)/graphics/x11drv/palette.c \
+ $(TOPOBJDIR)/graphics/x11drv/pen.c \
+ $(TOPOBJDIR)/graphics/x11drv/text.c \
+ $(TOPOBJDIR)/graphics/x11drv/xfont.c \
desktop.c \
clipboard.c \
dga2.c \
@@ -25,10 +39,7 @@
PROGRAMS = wineclipsrv
-EXTRA_OBJS = \
- $(TOPOBJDIR)/graphics/x11drv/x11drv.o
-
-SUBDIRS = \
+EXTRASUBDIRS = \
$(TOPOBJDIR)/graphics/x11drv
@MAKE_DLL_RULES@
@@ -38,9 +49,6 @@
wineclipsrv: wineclipsrv.c
$(CC) $(ALLCFLAGS) -o wineclipsrv $(SRCDIR)/wineclipsrv.c $(X_LIBS) $(XLIB) $(LIBS)
-$(EXTRA_OBJS): dummy
- @cd `dirname $@` && $(MAKE) `basename $@`
-
install:: $(PROGRAMS) install_libdir
$(MKINSTALLDIRS) $(bindir)
$(INSTALL_PROGRAM) wineclipsrv $(bindir)/wineclipsrv
diff --git a/files/.cvsignore b/files/.cvsignore
deleted file mode 100644
index f3c7a7c..0000000
--- a/files/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/files/Makefile.in b/files/Makefile.in
deleted file mode 100644
index 483914c..0000000
--- a/files/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-DEFS = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = files
-
-C_SRCS = \
- change.c \
- directory.c \
- dos_fs.c \
- drive.c \
- file.c \
- profile.c \
- smb.c \
- tape.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:
diff --git a/graphics/.cvsignore b/graphics/.cvsignore
deleted file mode 100644
index f3c7a7c..0000000
--- a/graphics/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/graphics/Makefile.in b/graphics/Makefile.in
deleted file mode 100644
index 530d948..0000000
--- a/graphics/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-DEFS = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = graphics
-
-C_SRCS = \
- bitblt.c \
- dispdib.c \
- env.c \
- escape.c \
- fontengine.c \
- mapping.c \
- painting.c \
- path.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:
diff --git a/graphics/x11drv/.cvsignore b/graphics/x11drv/.cvsignore
deleted file mode 100644
index f3c7a7c..0000000
--- a/graphics/x11drv/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/graphics/x11drv/Makefile.in b/graphics/x11drv/Makefile.in
deleted file mode 100644
index f87c87c..0000000
--- a/graphics/x11drv/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-DEFS = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = x11drv
-
-C_SRCS = \
- bitblt.c \
- bitmap.c \
- brush.c \
- clipping.c \
- codepage.c \
- dib.c \
- graphics.c \
- init.c \
- objects.c \
- opengl.c \
- palette.c \
- pen.c \
- text.c \
- xfont.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:
diff --git a/if1632/.cvsignore b/if1632/.cvsignore
deleted file mode 100644
index 20c58a4..0000000
--- a/if1632/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-relay16.s
diff --git a/if1632/Makefile.in b/if1632/Makefile.in
deleted file mode 100644
index 3f84314..0000000
--- a/if1632/Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-DEFS = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = if1632
-
-C_SRCS = \
- builtin.c \
- relay.c \
- snoop.c
-
-GEN_ASM_SRCS = \
- relay16.s
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-relay16.s: $(WINEBUILD)
- $(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -relay16
-
-### Dependencies:
diff --git a/loader/.cvsignore b/loader/.cvsignore
index c2b6613..8d6f5cb 100644
--- a/loader/.cvsignore
+++ b/loader/.cvsignore
@@ -1,2 +1 @@
-Makefile
task.glue.c
diff --git a/loader/Makefile.in b/loader/Makefile.in
deleted file mode 100644
index 54499a0..0000000
--- a/loader/Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-DEFS = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = loader
-
-C_SRCS = \
- elf.c \
- loadorder.c \
- main.c \
- module.c \
- pe_image.c \
- pe_resource.c \
- resource.c \
- task.c
-
-GLUE = task.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:
diff --git a/loader/ne/.cvsignore b/loader/ne/.cvsignore
index 9a8a172..43263dca 100644
--- a/loader/ne/.cvsignore
+++ b/loader/ne/.cvsignore
@@ -1,3 +1,2 @@
-Makefile
module.glue.c
segment.glue.c
diff --git a/loader/ne/Makefile.in b/loader/ne/Makefile.in
deleted file mode 100644
index 365d201..0000000
--- a/loader/ne/Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-DEFS = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = ne
-
-C_SRCS = \
- convert.c \
- module.c \
- resource.c \
- segment.c
-
-GLUE = module.c segment.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:
diff --git a/memory/.cvsignore b/memory/.cvsignore
index 17f5f8f..846dddf 100644
--- a/memory/.cvsignore
+++ b/memory/.cvsignore
@@ -1,2 +1 @@
-Makefile
local.glue.c
diff --git a/memory/Makefile.in b/memory/Makefile.in
deleted file mode 100644
index 3139d1b..0000000
--- a/memory/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-DEFS = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = memory
-
-C_SRCS = \
- atom.c \
- codepage.c \
- environ.c \
- global.c \
- heap.c \
- instr.c \
- local.c \
- registry.c \
- selector.c \
- string.c \
- virtual.c
-
-GLUE = local.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:
diff --git a/misc/.cvsignore b/misc/.cvsignore
deleted file mode 100644
index 6bc15da..0000000
--- a/misc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-printdrv.glue.c
diff --git a/misc/Makefile.in b/misc/Makefile.in
deleted file mode 100644
index 2ebc276..0000000
--- a/misc/Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-sysconfdir = @sysconfdir@
-DEFS = @DLLFLAGS@ -D__WINE__ -DETCDIR="\"$(sysconfdir)\""
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = misc
-
-C_SRCS = \
- cpu.c \
- error.c \
- main.c \
- options.c \
- registry.c \
- system.c \
- version.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:
-
diff --git a/msdos/.cvsignore b/msdos/.cvsignore
deleted file mode 100644
index f3c7a7c..0000000
--- a/msdos/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/msdos/Makefile.in b/msdos/Makefile.in
deleted file mode 100644
index 4fc628b..0000000
--- a/msdos/Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
-DEFS = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = msdos
-
-C_SRCS = \
- dosconf.c \
- dosmem.c \
- dpmi.c \
- int11.c \
- int12.c \
- int13.c \
- int15.c \
- int1a.c \
- int20.c \
- int21.c \
- int25.c \
- int26.c \
- int2a.c \
- int2f.c \
- int3d.c \
- int41.c \
- int4b.c \
- int5c.c \
- interrupts.c \
- ioports.c \
- ppdev.c \
- vxd.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:
diff --git a/objects/Makefile.in b/objects/Makefile.in
deleted file mode 100644
index 9a77c24..0000000
--- a/objects/Makefile.in
+++ /dev/null
@@ -1,40 +0,0 @@
-DEFS = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = objects
-
-C_SRCS = \
- bitmap.c \
- brush.c \
- clipping.c \
- color.c \
- dc.c \
- dcvalues.c \
- dib.c \
- enhmetafile.c \
- font.c \
- gdiobj.c \
- linedda.c \
- metafile.c \
- palette.c \
- pen.c \
- region.c \
- text.c
-
-GLUE = \
- dc.c \
- font.c \
- gdiobj.c \
- linedda.c \
- metafile.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:
diff --git a/ole/Makefile.in b/ole/Makefile.in
index bbebf8a..f8e5499 100644
--- a/ole/Makefile.in
+++ b/ole/Makefile.in
@@ -3,19 +3,15 @@
TOPOBJDIR = ..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = ole
+MODULE = none
C_SRCS = \
- ole2nls.c \
uuid.c
-all: $(MODULE).o libwine_uuid.a
+all: libwine_uuid.a
@MAKE_RULES@
-$(MODULE).o: ole2nls.o Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) ole2nls.o -o $@
-
libwine_uuid.a: uuid.o
$(RM) $@
$(AR) $@ uuid.o
diff --git a/relay32/.cvsignore b/relay32/.cvsignore
deleted file mode 100644
index f3c7a7c..0000000
--- a/relay32/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/relay32/Makefile.in b/relay32/Makefile.in
deleted file mode 100644
index 259ff71..0000000
--- a/relay32/Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-DEFS = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = relay32
-
-C_SRCS = \
- builtin32.c \
- relay386.c \
- snoop.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:
diff --git a/scheduler/.cvsignore b/scheduler/.cvsignore
deleted file mode 100644
index f3c7a7c..0000000
--- a/scheduler/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/scheduler/Makefile.in b/scheduler/Makefile.in
deleted file mode 100644
index aae0890..0000000
--- a/scheduler/Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
-DEFS = @DLLFLAGS@ -D__WINE__ -DBINDIR="\"$(bindir)\""
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = scheduler
-
-C_SRCS = \
- client.c \
- critsection.c \
- handle.c \
- pipe.c \
- process.c \
- pthread.c \
- synchro.c \
- sysdeps.c \
- syslevel.c \
- thread.c \
- timer.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:
diff --git a/tools/makedep.c b/tools/makedep.c
index 18c3875..2a2174a 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -231,12 +231,12 @@
/* try in src file directory */
if (!file)
{
- char *p = strrchr(pFile->included_by->name, '/');
+ char *p = strrchr(pFile->included_by->filename, '/');
if (p)
{
- int l = p - pFile->included_by->name + 1;
+ int l = p - pFile->included_by->filename + 1;
char *filename = xmalloc(l + strlen(pFile->name) + 1);
- memcpy( filename, pFile->included_by->name, l );
+ memcpy( filename, pFile->included_by->filename, l );
strcpy( filename + l, pFile->name );
if ((file = fopen( filename, "r" ))) pFile->filename = filename;
else free( filename );
diff --git a/win32/.cvsignore b/win32/.cvsignore
deleted file mode 100644
index f3c7a7c..0000000
--- a/win32/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/win32/Makefile.in b/win32/Makefile.in
deleted file mode 100644
index a14de17..0000000
--- a/win32/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-DEFS = @DLLFLAGS@ -D__WINE__ -DBINDIR="\"$(bindir)\""
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = win32
-
-C_SRCS = \
- console.c \
- device.c \
- editline.c \
- except.c \
- init.c \
- kernel32.c \
- newfns.c \
- time.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:
diff --git a/windows/.cvsignore b/windows/.cvsignore
index 1fae219..136739c 100644
--- a/windows/.cvsignore
+++ b/windows/.cvsignore
@@ -1,4 +1,3 @@
-Makefile
driver.glue.c
hook.glue.c
painting.glue.c
diff --git a/windows/Makefile.in b/windows/Makefile.in
deleted file mode 100644
index ed4d4c6..0000000
--- a/windows/Makefile.in
+++ /dev/null
@@ -1,56 +0,0 @@
-DEFS = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
-SRCDIR = @srcdir@
-VPATH = @srcdir@
-MODULE = windows
-EXTRAINCL = -I$(TOPSRCDIR)/dlls/user
-
-C_SRCS = \
- caret.c \
- class.c \
- clipboard.c \
- cursoricon.c \
- dce.c \
- defdlg.c \
- defwnd.c \
- dialog.c \
- driver.c \
- focus.c \
- hook.c \
- input.c \
- keyboard.c \
- mdi.c \
- message.c \
- msgbox.c \
- multimon.c \
- nonclient.c \
- painting.c \
- queue.c \
- rect.c \
- scroll.c \
- spy.c \
- struct32.c \
- syscolor.c \
- sysmetrics.c \
- sysparams.c \
- timer.c \
- user.c \
- win.c \
- winhelp.c \
- winpos.c \
- winproc.c
-
-GLUE = \
- driver.c \
- hook.c \
- painting.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
- $(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:
