Fixed problem with MakeFile not passing Options to ObjAsm

Detail:
  The Customer F NC needs to pass Options from the Components file to
  ObjAsm via the Makefile. The previous version didn't do this
  correctly.
Admin:
  Tested OK.

Version 1.52. Tagged as 'Podule-1_52'

Makefile

@@ -27,6 +27,8 @@
 #                         can pass in assembly-time constants to control
 #                         fake podule header for Customer F 5 Ethernet NC
 #                         which doesn't have a podule ROM. Paul Skirrow.
+# 13-Jan-00  PMS          Creates/deletes o dir, (ie don't keep o in cvs)
+# 13-Jan-00  PMS          Passes Options from MakeFile to ObjAsm 
 #
 # Paths
 #
@@ -43,9 +45,12 @@ CP      = copy
 MODGEN   = modgen
 LD      = link
 RM      = remove
+WIPE    = wipe
+
 CCFLAGS = -c -depend !Depend -IC:
-ASFLAGS = -depend !Depend -Stamp -quit -module -PreDefine ${OPTIONS} -To $@ -From
+ASFLAGS = -depend !Depend -Stamp -quit -module ${OPTIONS}
 CPFLAGS = ~cfr~v
+WFLAGS		= ~c~v
 
 TOKENISE = tokenise
 TOKENS   = Hdr:Tokens
@@ -93,11 +98,14 @@ resources-: resources_common
 	print LocalRes:CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
 
 clean:
-	${RM} ${TARGET}
-	${RM} ${MESSAGESMOD}
-	${RM} s.HelpTokens
-	${RM} setversion
-	@echo ${COMPONENT}: cleaned
+	${rm} o.Podule
+	${rm} o
+	${rm} linked
+	${rm} ${TARGET}
+	${rm} ${MESSAGESMOD}
+	${rm} s.HelpTokens
+	${rm} setversion
+	@echo ${COMPONENT}: cleaned 
 
 s.HelpTokens: ${TOKENS} HelpTexts
 	${TOKENISE} ${TOKENS} HelpTexts $@
@@ -112,7 +120,8 @@ ${EXP_CHDR}.${COMPONENT}: h.${COMPONENT}
 # Target 
 #
 ${TARGET}: ${SOURCE}
-	${AS} ${AFLAGS} GetAll.s Podule.o 
+	${MKDIR} o
+	${AS} ${ASFLAGS} GetAll.s Podule.o 
 	${MKDIR} rm.${MACHINE}
 	${LD} -o $@ -bin Podule.o
 	SetType $@ &FFA
@@ -143,6 +152,7 @@ ${MESSAGESMOD}: ${MESSAGES} setversion
 	unset Version
 
 setversion: Time+Date
+	${MKDIR} o
 	${AS} ${ASFLAGS} utils.getversion
 	settype setversion obey
 

VersionASM

@@ -6,9 +6,9 @@
                         GBLS    Module_MinorVersion
                         GBLS    Module_Date
                         GBLS    Module_FullVersion
-Module_MajorVersion     SETS    "1.51"
-Module_Version          SETA    151
+Module_MajorVersion     SETS    "1.52"
+Module_Version          SETA    152
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "12 Jan 2000"
-Module_FullVersion      SETS    "1.51"
+Module_Date             SETS    "13 Jan 2000"
+Module_FullVersion      SETS    "1.52"
                         END

VersionNum

-/* (1.51)
+/* (1.52)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        1.51
+#define Module_MajorVersion_CMHG        1.52
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                12 Jan 2000
+#define Module_Date_CMHG                13 Jan 2000
 
-#define Module_MajorVersion             "1.51"
-#define Module_Version                  151
+#define Module_MajorVersion             "1.52"
+#define Module_Version                  152
 #define Module_MinorVersion             ""
-#define Module_Date                     "12 Jan 2000"
+#define Module_Date                     "13 Jan 2000"
 
-#define Module_FullVersion              "1.51"
+#define Module_FullVersion              "1.52"

s/Module

@@ -46,12 +46,19 @@
 ; and make it more difficult to develop the Ethernet and Modem versions in tandem.)
 
 
-	GBLA	FakePodule
 
  [ :LNOT: :DEF: FakePodule
+	GBLA	FakePodule
 FakePodule SETA FakePodule0	; Use FakePodule0 from the machine header file if not defined by Components/makefile
  ]
+	; We only know how to fake up STB2 MPEG1, MPEG2 (and MPEG0) podules and EtherI Podule
+	ASSERT (FakePodule = 0) :LOR: (FakePodule = ProdType_STB2_MPEG1) :LOR: (FakePodule = ProdType_STB2_MPEG2) :LOR: (FakePodule = ProdType_EtherI)
 
+ [ FakePodule = ProdType_EtherI
+        !       0, "Assembling Podule Manager with Fake EtherI Podule header, (type $FakePodule)"
+ |
+        !       0, "Assembling Podule Manager with Fake Podule header, type $FakePodule"
+ ]
 
 MySWIChunkBase * Module_SWISystemBase + PoduleSWI * Module_SWIChunkSize
         ASSERT  MySWIChunkBase = Podule_ReadID
@@ -110,8 +117,6 @@ EASISpace       SETL    True
                 GBLL    ExtensionROMs
 ExtensionROMs   SETL    ExtROMSupport			; System build option
 
-	; We only know how to fake up STB2 MPEG1, MPEG2 (and MPEG0) podules and EtherI Podule
-	ASSERT (FakePodule = 0) :LOR: (FakePodule = ProdType_STB2_MPEG1) :LOR: (FakePodule = ProdType_STB2_MPEG2) :LOR: (FakePodule = ProdType_EtherI)
 
         [       :LNOT: ReleaseVersion
         !       0, "This version supports " :CC: ((:STR:NumberOfPodules) :RIGHT: 1) :CC: " podules"