Changeset 7853 for trunk/include


Ignore:
Timestamp:
Feb 9, 2002, 6:26:36 PM (24 years ago)
Author:
sandervl
Message:

makefile updates for def files

Location:
trunk/include
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/odin32.post.vac3.mk

    r7599 r7853  
    1 # $Id: odin32.post.vac3.mk,v 1.25 2001-12-09 22:03:07 sandervl Exp $
     1# $Id: odin32.post.vac3.mk,v 1.26 2002-02-09 17:26:36 sandervl Exp $
    22
    33#
    … …  
    8080DEFFILE = $(ORGTARGET).def
    8181!endif
     82!ifndef ORGDEFFILE
     83ORGDEFFILE = $(ORGTARGET).def
     84!endif
    8285
    8386# Set INTLIBS (interal) if SUBDIRS is defined and NO_INTERNAL_LIBS is undefined.
    … …  
    128131#
    129132!ifndef NO_MAIN_RULE
    130 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(LIBS) $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(DEFFILE) $(OBJDIR)\$(TARGET).lrf
     133$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(LIBS) $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(ORGDEFFILE) $(OBJDIR)\$(TARGET).lrf
    131134    $(CMDQD_WAIT)
    132135    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    … …  
    156159$(LIBS:  =^
    157160)
    158 $(OBJDIR)\bldlevel.$(DEFFILE)
     161$(OBJDIR)\bldlevel.$(ORGDEFFILE)
    159162<<keep
    160163!else
    … …  
    166169$(LIBS: =+^
    167170),
    168 $(OBJDIR)\bldlevel.$(DEFFILE);
     171$(OBJDIR)\bldlevel.$(ORGDEFFILE);
    169172<<keep
    170173!endif
    … …  
    203206#
    204207!ifndef NO_MAIN_RULE
    205 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(LIBS) $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(DEFFILE) $(OBJDIR)\$(TARGET).lrf
     208$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(LIBS) $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(ORGDEFFILE) $(OBJDIR)\$(TARGET).lrf
    206209    $(CMDQD_WAIT)
    207210    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    … …  
    231234$(LIBS:  =^
    232235)
    233 $(OBJDIR)\bldlevel.$(DEFFILE)
     236$(OBJDIR)\bldlevel.$(ORGDEFFILE)
    234237<<keep
    235238!else
    … …  
    241244$(LIBS: =+^
    242245),
    243 $(OBJDIR)\bldlevel.$(DEFFILE);
     246$(OBJDIR)\bldlevel.$(ORGDEFFILE);
    244247<<keep
    245248!endif
    … …  
    422425!ifndef LIBTARGET
    423426!ifndef NOTEXPDEF
    424 $(OBJDIR)\$(ORGTARGET)exp.def: $(DEFFILE)
     427$(OBJDIR)\$(ORGTARGET)exp.def: $(ORGDEFFILE)
    425428    $(IMPDEF) $(IMPDEF_FLAGS) $** $@
    426429!endif
    … …  
    431434# Common: Make .def-file with buildlevel info.
    432435#
    433 $(OBJDIR)\bldlevel.$(DEFFILE): $(DEFFILE)
     436$(OBJDIR)\bldlevel.$(ORGDEFFILE): $(DEFFILE)
    434437    $(BLDLEVELINF) $(DEFFILE) $@ -R"$(DEFFILE)" \
    435438        -V"#define=ODIN32_VERSION,$(ODIN32_INCLUDE)\odinbuild.h" \

  • trunk/include/odin32.post.wat.mk

    r7267 r7853  
    1 # $Id: odin32.post.wat.mk,v 1.18 2001-10-29 14:20:13 bird Exp $
     1# $Id: odin32.post.wat.mk,v 1.19 2002-02-09 17:26:36 sandervl Exp $
    22
    33#
    … …  
    8080DEFFILE = $(ORGTARGET).def
    8181!endif
     82!ifndef ORGDEFFILE
     83ORGDEFFILE = $(ORGTARGET).def
     84!endif
    8285
    8386# Set INTLIBS (interal) if SUBDIRS is defined and NO_INTERNAL_LIBS is undefined.
    … …  
    146149#
    147150!ifndef NO_LNKFILE_RULE
    148 $(OBJDIR)\$(TARGET).lrf: $(__MAKEFILES__) $(OBJDIR)\bldlevel.$(DEFFILE) $(DEFFILE) $(ODIN32_INCLUDE)\odin32.post.wat.mk
     151$(OBJDIR)\$(TARGET).lrf: $(__MAKEFILES__) $(OBJDIR)\bldlevel.$(ORGDEFFILE) $(DEFFILE) $(ODIN32_INCLUDE)\odin32.post.wat.mk
    149152    $(RM) $(OBJDIR)\$(TARGET).lrf2 $@
    150     $(KDEF2WAT) $(OBJDIR)\bldlevel.$(DEFFILE) $@ <<$(OBJDIR)\$(TARGET).lrf2
     153    $(KDEF2WAT) $(OBJDIR)\bldlevel.$(ORGDEFFILE) $@ <<$(OBJDIR)\$(TARGET).lrf2
    151154$(LD2FLAGS)
    152155name $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    … …  
    206209#
    207210!ifndef NO_LNKFILE_RULE
    208 $(OBJDIR)\$(TARGET).lrf: $(__MAKEFILES__) $(ODIN32_INCLUDE)\odin32.post.wat.mk $(OBJDIR)\bldlevel.$(DEFFILE)
     211$(OBJDIR)\$(TARGET).lrf: $(__MAKEFILES__) $(ODIN32_INCLUDE)\odin32.post.wat.mk $(OBJDIR)\bldlevel.$(ORGDEFFILE)
    209212    $(RM) $(OBJDIR)\$(TARGET).lrf2 $@
    210213!ifdef DEFFILE
    211     $(KDEF2WAT) $(OBJDIR)\bldlevel.$(DEFFILE) $@ <<$(OBJDIR)\$(TARGET).lrf2
     214    $(KDEF2WAT) $(OBJDIR)\bldlevel.$(ORGDEFFILE) $@ <<$(OBJDIR)\$(TARGET).lrf2
    212215!else
    213216    $(ECHO) Creating <<$@
    … …  
    388391!ifndef LIBTARGET
    389392!ifndef NOTEXPDEF
    390 $(OBJDIR)\$(ORGTARGET)exp.def: $(DEFFILE)
     393$(OBJDIR)\$(ORGTARGET)exp.def: $(ORGDEFFILE)
    391394    $(IMPDEF) $(IMPDEF_FLAGS) $[@ $@
    392395!endif
    … …  
    397400# Common: Make .def-file with buildlevel info.
    398401#
    399 $(OBJDIR)\bldlevel.$(DEFFILE): $(DEFFILE)
     402$(OBJDIR)\bldlevel.$(ORGDEFFILE): $(DEFFILE)
    400403    $(BLDLEVELINF) $(DEFFILE) $@ -R"$(DEFFILE)" \
    401404        -V"$#define=ODIN32_VERSION,$(ODIN32_INCLUDE)\odinbuild.h" \

  • trunk/include/odin32.post.watn.mk

    r7267 r7853  
    1 # $Id: odin32.post.watn.mk,v 1.2 2001-10-29 14:20:13 bird Exp $
     1# $Id: odin32.post.watn.mk,v 1.3 2002-02-09 17:26:36 sandervl Exp $
    22
    33#
    … …  
    8080DEFFILE = $(ORGTARGET).def
    8181!endif
     82!ifndef ORGDEFFILE
     83ORGDEFFILE = $(ORGTARGET).def
     84!endif
    8285
    8386# Set INTLIBS (interal) if SUBDIRS is defined and NO_INTERNAL_LIBS is undefined.
    … …  
    144147#
    145148!ifndef NO_LNKFILE_RULE
    146 $(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(OBJDIR)\bldlevel.$(DEFFILE) $(DEFFILE) $(ODIN32_INCLUDE)\odin32.post.watn.mk
     149$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(OBJDIR)\bldlevel.$(ORGDEFFILE) $(DEFFILE) $(ODIN32_INCLUDE)\odin32.post.watn.mk
    147150    $(RM) $(OBJDIR)\$(TARGET).lrf2 $@
    148     $(KDEF2WAT) $(OBJDIR)\bldlevel.$(DEFFILE) $@ <<$(OBJDIR)\$(TARGET).lrf2
     151    $(KDEF2WAT) $(OBJDIR)\bldlevel.$(ORGDEFFILE) $@ <<$(OBJDIR)\$(TARGET).lrf2
    149152$(LD2FLAGS)
    150153name $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    … …  
    203206#
    204207!ifndef NO_LNKFILE_RULE
    205 $(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.watn.mk $(OBJDIR)\bldlevel.$(DEFFILE)
     208$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.watn.mk $(OBJDIR)\bldlevel.$(ORGDEFFILE)
    206209    $(RM) $(OBJDIR)\$(TARGET).lrf2 $@
    207210!ifdef DEFFILE
    208     $(KDEF2WAT) $(OBJDIR)\bldlevel.$(DEFFILE) $@ <<$(OBJDIR)\$(TARGET).lrf2
     211    $(KDEF2WAT) $(OBJDIR)\bldlevel.$(ORGDEFFILE) $@ <<$(OBJDIR)\$(TARGET).lrf2
    209212$(LD2FLAGS)
    210213name $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    … …  
    389392!ifndef LIBTARGET
    390393!ifndef NOTEXPDEF
    391 $(OBJDIR)\$(ORGTARGET)exp.def: $(DEFFILE)
     394$(OBJDIR)\$(ORGTARGET)exp.def: $(ORGDEFFILE)
    392395    $(IMPDEF) $(IMPDEF_FLAGS) $** $@
    393396!endif
    … …  
    398401# Common: Make .def-file with buildlevel info.
    399402#
    400 $(OBJDIR)\bldlevel.$(DEFFILE): $(DEFFILE)
     403$(OBJDIR)\bldlevel.$(ORGDEFFILE): $(DEFFILE)
    401404    $(BLDLEVELINF) $(DEFFILE) $@ -R"$(DEFFILE)" \
    402405        -V"#define=ODIN32_VERSION,$(ODIN32_INCLUDE)\odinbuild.h" \
Note: See TracChangeset for help on using the changeset viewer.