Changeset 129

Timestamp:

May 12, 2003, 7:17:09 PM (22 years ago)

Author:

bird

Message:

Fixed (worked around) make dependency issues.

Location:

trunk/src/emx

Files:

• mklib.smak (modified) (1 diff, 1 prop)
• src/lib/io/io.smak (modified) (1 diff, 1 prop)
• src/lib/math/math.smak (modified) (1 diff, 1 prop)
• src/lib/startup/startup.smak (modified) (1 diff, 1 prop)

trunk/src/emx/mklib.smak

@@ -29 +29 @@
 TARGDIRS += $(.DIRS@OMF)
 $(.MODULE)@omf: $(.MODULE) $(.DIRS@OMF) $.$(.TARG@OMF)
+# bird: Add a dependency rule to help make
+RULES += \
+        $(call FECHO,_@,$.$(.TARG@OMF): $.$(.TARG))$(NL)
 endif # neq ($(findstring aout,$(.TKIND)),)
 

trunk/src/emx/src/lib/io/io.smak

@@ -17 +17 @@
 
 include comend.smak
+
+# bird: added dependency to help make make omf version.
+$.omf/src/lib/io/386/binmode.obj: $.aout/src/lib/io/386/binmode.o
+

trunk/src/emx/src/lib/math/math.smak

@@ -10 +10 @@
   sinl.o sinhl.o sqrtl.o tanl.o tanhl.o truncl.o)
 
-$(call .MVER,math/%f.o): src/lib/math/%.s
+# bird: .s files are in math/386 not math.
+#       And besides the call doesn't work correctly
+# <rant>Pitty gnu make doesn have .for like BSD make have, that one actually
+#       can generate rules on the fly :) </rant>
+#
+#$(call .MVER,math/%f.o): src/lib/math/386/%.s
+#       $(call DO.COMPILE.s, -DFLOAT)
+#$(call .MVER,math/%l.o): src/lib/math/386/%.s
+#       $(call DO.COMPILE.s, -DLONG_DOUBLE)
+
+$.aout/src/lib/math/386/%f.o: src/lib/math/386/%.s
         $(call DO.COMPILE.s, -DFLOAT)
-$(call .MVER,math/%l.o): src/lib/math/%.s
+$.aout/src/lib/math/386/%l.o: src/lib/math/386/%.s
         $(call DO.COMPILE.s, -DLONG_DOUBLE)
+$.aout-prof/src/lib/math/386/%f.o: src/lib/math/386/%.s
+        $(call DO.COMPILE.s, -DFLOAT)
+$.aout-prof/src/lib/math/386/%l.o: src/lib/math/386/%.s
+        $(call DO.COMPILE.s, -DLONG_DOUBLE)
+

trunk/src/emx/src/lib/startup/startup.smak

@@ -33 +33 @@
         $(call DO.AOUT2OMF,-m__text)
 
+# bird: dependencies to help stupid make.
+$.omf/src/lib/startup/mcrt0.obj: $.aout/src/lib/startup/mcrt0.o
+$.omf/src/lib/startup/gcrt0.obj: $.aout/src/lib/startup/gcrt0.o
+$.omf/src/lib/startup/386/dll0.obj:  $.aout/src/lib/startup/386/dll0.o
+$.omf/src/lib/startup/386/crt0.obj:  $.aout/src/lib/startup/386/crt0.o
+$.omf/src/lib/startup/386/res0.obj:  $.aout/src/lib/startup/386/res0.o
+
 include comend.smak