diff --git a/Make.rules.in b/Make.rules.in index 519b1ec15ee..644811e7606 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -223,11 +223,6 @@ $(MAKEDEP) check_makedep: $(BUILD) check_winebuild: cd $(TOPOBJDIR)/tools/winebuild && $(MAKE) winebuild -# Rule for main module - -$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in - $(LDCOMBINE) $(OBJS) -o $(MODULE).o - # Rules for makefile Makefile: Makefile.in $(TOPSRCDIR)/configure diff --git a/console/Makefile.in b/console/Makefile.in index 3da9931a5e0..77399288e4d 100644 --- a/console/Makefile.in +++ b/console/Makefile.in @@ -16,4 +16,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/controls/Makefile.in b/controls/Makefile.in index 52f7167c92c..03e57e1194d 100644 --- a/controls/Makefile.in +++ b/controls/Makefile.in @@ -24,4 +24,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/files/Makefile.in b/files/Makefile.in index 0bf5442c43f..2e76890abd5 100644 --- a/files/Makefile.in +++ b/files/Makefile.in @@ -20,4 +20,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/graphics/Makefile.in b/graphics/Makefile.in index 48aa305a970..cccb3f58713 100644 --- a/graphics/Makefile.in +++ b/graphics/Makefile.in @@ -20,4 +20,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/graphics/enhmetafiledrv/Makefile.in b/graphics/enhmetafiledrv/Makefile.in index dcbd9e601c8..53df9c9f9a8 100644 --- a/graphics/enhmetafiledrv/Makefile.in +++ b/graphics/enhmetafiledrv/Makefile.in @@ -16,4 +16,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/graphics/metafiledrv/Makefile.in b/graphics/metafiledrv/Makefile.in index 49022fc78df..d63da4502a5 100644 --- a/graphics/metafiledrv/Makefile.in +++ b/graphics/metafiledrv/Makefile.in @@ -18,4 +18,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/graphics/win16drv/Makefile.in b/graphics/win16drv/Makefile.in index f10b0b80643..1649ddbc61c 100644 --- a/graphics/win16drv/Makefile.in +++ b/graphics/win16drv/Makefile.in @@ -21,4 +21,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/graphics/x11drv/Makefile.in b/graphics/x11drv/Makefile.in index 5edf5faecb7..fbc00b5ae55 100644 --- a/graphics/x11drv/Makefile.in +++ b/graphics/x11drv/Makefile.in @@ -26,4 +26,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/if1632/Makefile.in b/if1632/Makefile.in index 2ac4ad28587..7e2b875e266 100644 --- a/if1632/Makefile.in +++ b/if1632/Makefile.in @@ -20,6 +20,9 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + asmrelay.s: $(BUILD) $(BUILD) @DLLFLAGS@ -o $@ -relay diff --git a/loader/Makefile.in b/loader/Makefile.in index 52e4f840202..33f8efb9aa4 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -22,4 +22,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/loader/dos/Makefile.in b/loader/dos/Makefile.in index 20f7f9f5981..4f2c29d6e88 100644 --- a/loader/dos/Makefile.in +++ b/loader/dos/Makefile.in @@ -18,4 +18,7 @@ dosmod: dosmod.c @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/loader/ne/Makefile.in b/loader/ne/Makefile.in index 7eb11fc4bd8..365d201ab7b 100644 --- a/loader/ne/Makefile.in +++ b/loader/ne/Makefile.in @@ -17,4 +17,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/memory/Makefile.in b/memory/Makefile.in index c4c65fd712a..fc7e36a8568 100644 --- a/memory/Makefile.in +++ b/memory/Makefile.in @@ -25,4 +25,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/misc/Makefile.in b/misc/Makefile.in index 28efe29778f..2810f04aa08 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -27,5 +27,8 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/miscemu/Makefile.in b/miscemu/Makefile.in index cf1e072ef53..3096d41679d 100644 --- a/miscemu/Makefile.in +++ b/miscemu/Makefile.in @@ -14,4 +14,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/msdos/Makefile.in b/msdos/Makefile.in index 96567bcdb31..44f14a0f679 100644 --- a/msdos/Makefile.in +++ b/msdos/Makefile.in @@ -43,4 +43,7 @@ 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 index 6d9705b60ff..a198d091df1 100644 --- a/objects/Makefile.in +++ b/objects/Makefile.in @@ -29,4 +29,7 @@ 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 17c48388a90..4a699827a32 100644 --- a/ole/Makefile.in +++ b/ole/Makefile.in @@ -14,4 +14,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/relay32/Makefile.in b/relay32/Makefile.in index c4b9867044c..259ff7129e2 100644 --- a/relay32/Makefile.in +++ b/relay32/Makefile.in @@ -14,4 +14,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/resources/Makefile.in b/resources/Makefile.in index 8300b87f287..5882886e736 100644 --- a/resources/Makefile.in +++ b/resources/Makefile.in @@ -12,4 +12,7 @@ all: check_wrc $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/scheduler/Makefile.in b/scheduler/Makefile.in index 9777193dbbb..b64b88a6953 100644 --- a/scheduler/Makefile.in +++ b/scheduler/Makefile.in @@ -27,4 +27,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/tsx11/Makefile.in b/tsx11/Makefile.in index c3bf8a4c8df..7bd5dd06b16 100644 --- a/tsx11/Makefile.in +++ b/tsx11/Makefile.in @@ -21,4 +21,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/win32/Makefile.in b/win32/Makefile.in index 0e66230979d..e52d5446d33 100644 --- a/win32/Makefile.in +++ b/win32/Makefile.in @@ -20,4 +20,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/windows/Makefile.in b/windows/Makefile.in index 944f0e63454..036b1c78b6e 100644 --- a/windows/Makefile.in +++ b/windows/Makefile.in @@ -49,4 +49,7 @@ all: $(MODULE).o @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: diff --git a/windows/x11drv/Makefile.in b/windows/x11drv/Makefile.in index 69e327f9629..e3b6a16493e 100644 --- a/windows/x11drv/Makefile.in +++ b/windows/x11drv/Makefile.in @@ -21,4 +21,7 @@ wineclipsrv: wineclipsrv.c @MAKE_RULES@ +$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in + $(LDCOMBINE) $(OBJS) -o $@ + ### Dependencies: