Changeset 4620


Ignore:
Timestamp:
Nov 19, 2000, 9:35:50 AM (24 years ago)
Author:
bird
Message:

New makefile style.

Location:
trunk
Files:
26 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified trunk/include/pdwin32.tools

    r4334 r4620  
    1 # $Id: pdwin32.tools,v 1.14 2000-09-28 03:16:23 bird Exp $
     1# $Id: pdwin32.tools,v 1.15 2000-11-19 08:31:20 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    3434MAPSYM      = mapsym
    3535EXISTS      = $(PDWIN32_TOOLS)\Exists.cmd
     36DODIRS      = $(PDWIN32_TOOLS)\DoDirs.cmd
    3637DOWITHDIRS  = $(PDWIN32_TOOLS)\dowithdirs.cmd
    3738IMPDEF      = $(PDWIN32_TOOLS)\impdef.exe
  • TabularUnified trunk/include/pdwin32.vac3.dbg

    r4477 r4620  
    1 # $Id: pdwin32.vac3.dbg,v 1.30 2000-10-10 18:01:45 sandervl Exp $
     1# $Id: pdwin32.vac3.dbg,v 1.31 2000-11-19 08:31:20 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    3232# Tool Flags
    3333#
    34 CFLAGS           = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__ -DTCPV40HDRS -DCOMCTL32UNDOC
    35 CXXFLAGS         = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ /Gx+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__ -DTCPV40HDRS -DCOMCTL32UNDOC
    36 CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- /Gx+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__
    37 CFLAGS_WIN32APP  = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
    38 CXXFLAGS_WIN32APP= -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
     34CFLAGS           = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+
     35CXXFLAGS         = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ /Gx+
     36CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- /Gx+
     37CFLAGS_WIN32APP  = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+
     38CXXFLAGS_WIN32APP= -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+
     39
     40CINCLUDES        = -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE)
     41CDEFINES         = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__ -DTCPV40HDRS -DCOMCTL32UNDOC
     42CDEFINES_ODINCRT = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__
     43CDEFINES_WIN32APP= -DDEBUG -D__WIN32OS2__ -D__i386__
    3944
    4045!ifdef DEBUGALL
     
    5055IMPLIBFLAGS      = /nologo
    5156ILIBFLAGS        = /quiet /nologo
    52 RCFLAGS          = -s -I. -I$(CPPMAIN)\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
     57RCFLAGS          = -s -I. -I$(CPPMAIN)\include
    5358OS2RCFLAGS       = -r -n
    5459OS2RCLFLAGS      = -x2 -n
  • TabularUnified trunk/include/pdwin32.vac3.post

    r4547 r4620  
    1 # $Id: pdwin32.vac3.post,v 1.3 2000-11-01 01:34:19 bird Exp $
     1# $Id: pdwin32.vac3.post,v 1.4 2000-11-19 08:31:20 bird Exp $
    22#
    33# Odin32 API
     
    99# Define NOTEXPDEF to remove the $(TARGET).lib and $(TARGET)exp.def rules.
    1010# Define EXETARGET to make an executable. (This also applies to pdwin32.mk.)
     11# Define LIBTARGET to make an internal library.
    1112# Define LOCALCLEAN if only the local directory is to be clean.
    1213# Define CLEAN2 to invoke a second clean rule named 'clean2'.
    1314# Define NOCLEAN to exclude the clean rule. (Remember to make your own!)
    1415#
    15 # New style: (define NEW_STYLE)
     16# New style: (!defined OLD_STYLE)
    1617# Define NO_ALL_RULE to not make default all rule.
    1718# Define NO_LIB_RULE to not make default lib rule.
    18 # Define NO_DLL_RULE to not make default dll rule.
    19 # Define NO_EXE_RULE to not make default exe rule.
     19# Define NO_MAIN_RULE to not make default main target rule.
    2020# Define NO_LNKFILE_RULE to not make default link-file rule.
    2121# Define NO_DEP_RULE to not make dependencies rule.
    2222# Define NO_CLEAN_RULE to not make clean rule (same as NOCLEAN - use this!).
     23# Define NO_INTERNAL_LIBS to not include libs rule for subdirectories.
     24# Define NO_MAIN_BIN_COPY to not copy the target and sym file to the main
     25#    binary directory. It is only copied to the compiler specific directory.
     26#    Main bin is /bin. Compiler specific bin is /bin/debug, /bin/debug.vac36, etc.
     27# Define ADDITIONAL_DEP to add dependencies rules.
     28#
     29# Define MAKEFILE if the name of the makefile isn't "makefile".
     30# Define DEFFILE to specify another file than $(TARGET).def or $(ORGTARGET).def.
     31#    Define this if your .exe file have a .def file.
     32# Define OS2RES as the names of the OS/2 .res file to create and link
     33#    with the target .dll or .exe.
     34# Define LIBS as a list of all the libraries to link
     35#    with the target .dll or .exe.
     36# Define SUBDIRS when you have subdirectories which should be made.
     37#    dep and lib supports this fully. The rule libs are added, since we assume you
     38#    makes internal libraries in the subdirectories. The libs rule is one of the
     39#    dependencies of the main target.
    2340#
    2441
    2542!ifndef TARGET_EXTENSION
    26 !ifdef EXETARGET
     43!   ifdef EXETARGET
    2744TARGET_EXTENSION=exe
    28 !else
     45!   else
     46!       ifdef LIBTARGET
     47TARGET_EXTENSION=lib
     48!       else
    2949TARGET_EXTENSION=dll
    30 !endif
    31 !endif
    32 
    33 !ifdef NEW_STYLE
     50!       endif
     51!   endif
     52!endif
     53
     54
     55!ifndef OLD_STYLE
     56
     57# Set default MAKEFILE if needed
     58!ifndef MAKEFILE
     59MAKEFILE = makefile
     60!endif
     61
     62# Set default ORGTARGET if needed.
     63!ifndef ORGTARGET
     64ORGTARGET=$(TARGET)
     65!endif
     66
     67# Set default DEFFILE if needed. (Currently for dlls only.)
     68!ifndef DEFFILE
     69!   ifndef EXETARGET
     70DEFFILE = $(ORGTARGET).def
     71!   endif
     72!endif
     73
     74# Set INTLIBS (interal) if SUBDIRS is defined and NO_INTERNAL_LIBS is undefined.
     75!ifdef SUBDIRS
     76!   ifndef NO_INTERNAL_LIBS
     77!       ifndef LIBTARGET
     78INTLIBS = libs
     79!       else
     80INTLIBS = libs_sub
     81!       endif
     82!   endif
     83!endif
     84
     85
     86!ifndef LIBTARGET
    3487!ifndef EXETARGET
    35 
    36 
    37 # All rule - build objs, target dll, copies target to bin and makes libs.
     88###############################################################################
     89# DLL Target
     90###############################################################################
     91
     92#
     93# Dll: All rule - build objs, target dll, copies target to bin and makes libs.
     94#
    3895!ifndef NO_ALL_RULE
    3996all:    $(OBJDIR) \
     97        $(INTLIBS) \
    4098        $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) \
     99        $(OBJDIR)\$(TARGET).sym \
    41100        $(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION) \
     101        $(PDWIN32_BIN)\$(TARGET).sym \
    42102        lib
    43103!endif
    44104
    45105
    46 # Lib rule - build importlibrary (and evt. other libs)
     106#
     107# Dll: Lib rule - build importlibrary (and evt. other libs)
     108#
    47109!ifndef NO_LIB_RULE
    48 lib:    $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    49 !endif
    50 
    51 
    52 # Dll rule - builds the target dll.
    53 !ifndef NO_DLL_RULE
    54 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     110lib:    $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
     111!endif
     112
     113
     114#
     115# Dll: Main target rule - builds the target dll.
     116#
     117!ifndef NO_MAIN_RULE
     118$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
    55119    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    56 !endif
    57 
    58 
    59 # Linker file - creates the parameter file passed on to the linker.
     120!ifdef OS2RES
     121    $(OS2RC) $(OS2RCLFLAGS) $(OS2RES) $@
     122!endif
     123!endif
     124
     125
     126#
     127# Dll: Linker file - creates the parameter file passed on to the linker.
     128#
    60129!ifndef NO_LNKFILE_RULE
    61 $(OBJDIR)\$(TARGET).lrf: makefile
     130$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE)
    62131    @echo Creating file <<$@
    63132/OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
     
    65134$(OBJS)
    66135$(LIBS)
    67 $(TARGET).def
     136$(DEFFILE)
    68137<<keep
    69138!endif
    70139
    71140
    72 # Dep rule - makes depenencies for C, C++ and Asm files.
    73 !ifndef NO_DEP_RULE
    74 dep:
    75     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    76         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    77 !endif
    78 
    79141!else # !ifndef EXETARGET
    80 
    81 
    82 # All rule - build objs, target exe, copies target to bin.
     142###############################################################################
     143# EXE Target
     144###############################################################################
     145
     146#
     147# Exe: All rule - build objs, target exe, copies target to bin.
     148#
    83149!ifndef NO_ALL_RULE
    84150all:    $(OBJDIR) \
     151        $(INTLIBS) \
    85152        $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) \
    86         $(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION)
    87 !endif
    88 
    89 
    90 # Lib rule - dummy rule
     153        $(OBJDIR)\$(TARGET).sym \
     154        $(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION) \
     155        $(PDWIN32_BIN)\$(TARGET).sym
     156!endif
     157
     158
     159#
     160# Exe: Lib rule - dummy rule
     161#
    91162!ifndef NO_LIB_RULE
    92163lib:
     
    94165
    95166
    96 # Exe rule - builds the target exe.
    97 !ifndef NO_EXE_RULE
    98 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     167#
     168# Exe: Main target rule - builds the target exe.
     169#
     170!ifndef NO_MAIN_RULE
     171$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
    99172    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    100 !endif
    101 
    102 
    103 # Linker file - creates the parameter file passed on to the linker.
     173!ifdef OS2RES
     174    $(OS2RC) $(OS2RCLFLAGS) $(OS2RES) $@
     175!endif
     176!endif
     177
     178
     179#
     180# Exe: Linker file - creates the parameter file passed on to the linker.
     181#
    104182!ifndef NO_LNKFILE_RULE
    105 $(OBJDIR)\$(TARGET).lrf: makefile
     183$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE)
    106184    @echo Creating file <<$@
    107185/OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    108186/MAP:$(OBJDIR)\$(TARGET).map
    109187$(OBJS)
    110 $(LIBS)
    111 $(TARGET).def
     188$(LIBS) $(DEFFILE)
    112189<<keep
    113190!endif
    114191
    115192
    116 # Dep rule - makes depenencies for C, C++ and Asm files.
    117 !ifndef NO_DE_PRULE
    118 dep:
    119     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    120         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    121 !endif
    122 
    123 
    124 !endif # EXETARGET
    125 !endif # NEW_STYLE
    126 
    127 
    128 # Copy library rule.
    129 !ifndef ORGTARGET
    130 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    131 !else
     193!endif # !ifndef EXETARGET !else
     194!else # !ifndef LIBTARGET
     195###############################################################################
     196# LIB target (internal object library)
     197###############################################################################
     198
     199#
     200# Localcleanup is default for internal object libraries.
     201#
     202LOCALCLEAN = 1
     203
     204
     205#
     206# Lib: All rule - build objs and target library.
     207#
     208!ifndef NO_ALL_RULE
     209all:    $(OBJDIR) \
     210        $(INTLIBS) \
     211        $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
     212!endif
     213
     214
     215#
     216# Lib: Lib rule - dummy rule
     217#
     218!ifndef NO_LIB_RULE
     219lib:
     220!endif
     221
     222
     223#
     224# Lib: Internal library rule. Same as the all rule.
     225#
     226!ifndef NO_INTERNAL_LIBS
     227libs: all
     228!endif
     229
     230
     231#
     232# Lib: Main target rule - builds the target internal library.
     233#
     234!ifndef NO_MAIN_RULE
     235$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS)
     236    $(RM) $@
     237    $(ILIB) $(ILIBFLAGS) $@ @<<
     238$(OBJS:  = &^
     239)
     240$(OBJDIR)\$(@B).lst
     241<<
     242!endif
     243
     244
     245!endif # !ifndef LIBTARGET
     246
     247
     248###############################################################################
     249# Common rules for both exe and dll, new style
     250###############################################################################
     251
     252#
     253# Common (new): Dep rule - makes depenencies for C, C++ and Asm files.
     254#
     255!ifndef NO_DEP_RULE
     256dep: dep_internal $(ADDITIONAL_DEP)
     257dep_internal:
     258    $(DEPEND) $(CINCLUDES) *.c *.cpp *.h *.asm *.inc \
     259        *.rc *.dlg $(PDWIN32_INCLUDE)\*.h -robj *.orc
     260!ifdef SUBDIRS
     261    $(DODIRS) "$(SUBDIRS)"  $(MAKE_CMD) dep
     262!endif
     263!endif
     264
     265
     266#
     267# Common: Internal library rule. Make libraries in subdirectories.
     268#   For makefiles with subdirectories is common to have make libraries in subdirectories.
     269#
     270!ifndef NO_INTERNAL_LIBS
     271!ifdef INTLIBS
     272$(INTLIBS):
     273    $(DODIRS) "$(SUBDIRS)"  $(MAKE_CMD) libs
     274!endif
     275!endif
     276
     277!endif # OLD_STYLE
     278
     279###############################################################################
     280# Common rules for both exe and dll, old and new style.
     281###############################################################################
     282
     283#
     284# Common: Copy library rule.
     285#
    132286$(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
    133 !endif
    134287    $(CP) $** $@
    135288
    136289
    137 # Copy dll rule.
     290#
     291# Common: Copy dll/exe rule.
     292#
    138293$(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION): $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
     294    $(CP) $** $@
     295!ifndef NO_MAIN_BIN_COPY
     296    -$(CP) $** $(@D)..\..\$(@F)
     297!endif
     298
     299
     300#
     301# Common: Copy sym rule.
     302#
     303$(PDWIN32_BIN)\$(TARGET).sym: $(OBJDIR)\$(TARGET).sym
     304    $(CP) $** $@
     305!ifndef NO_MAIN_BIN_COPY
     306    -$(CP) $** $(@D)..\..\$(@F)
     307!endif
     308
     309
     310#
     311# Common: Make sym file rule.
     312#
     313$(OBJDIR)\$(TARGET).sym: $(OBJDIR)\$(TARGET).map
    139314    cd $(OBJDIR)
    140315    $(MAPSYM) $(TARGET).map
    141316    cd ..\..
    142     $(CP) $(OBJDIR)\$(TARGET).sym $(PDWIN32_BIN)
    143     $(CP) $** $@
    144     -$(CP) $** $(@D)..\..\$(@F)
    145     -$(CP) $(OBJDIR)\$(TARGET).sym $(@D)..\..
    146 
    147 
     317
     318
     319#
     320# Common: Make library from the <>exp.def or the <>.def file.
     321#
    148322!ifndef NOTEXPDEF
    149 # make library from the <>exp.def file.
    150 !ifndef ORGTARGET
    151 $(TARGET).LIB: $(TARGET)exp.def
     323$(ORGTARGET).lib: $(ORGTARGET)exp.def
     324    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    152325!else
    153 $(ORGTARGET).LIB: $(ORGTARGET)exp.def
    154 !endif
     326$(TARGET).lib: $(DEFFILE)
    155327    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    156     $(CP) $@ $(PDWIN32_LIB)
    157 
    158 
    159 # make the <>exp.def file.
    160 !ifndef ORGTARGET
    161 $(TARGET)exp.def: $(TARGET).def
    162 !else
    163 $(ORGTARGET)exp.def: $(ORGTARGET).def
    164 !endif
     328!endif
     329
     330
     331#
     332# Common: Make the <>exp.def file.
     333#
     334!ifndef NOTEXPDEF
     335$(ORGTARGET)exp.def: $(DEFFILE)
    165336    $(IMPDEF) $** $@
    166337!endif
    167338
    168339
    169 # Create the object directory.
     340#
     341# Common: Create the object directory.
     342#
    170343$(OBJDIR):
    171344    @if not exist bin $(MKDIR) bin
     
    174347
    175348#
    176 # General clean rule. To clean more add it to CLEANEXTRAS!
     349# Common: General clean rule. To clean more add it to CLEANEXTRAS!
    177350#
    178351!ifndef NOCLEAN
     
    182355clean:  clean2
    183356!endif
    184     $(RM) *.LIB *.res *.map *.pch \
     357    $(RM) *.lib *.res *.map *.pch \
    185358!if "$(OBJDIR)" != ""
    186359     $(OBJDIR)\* \
    187360!endif
    188361!ifndef LOCALCLEAN
    189         $(PDWIN32_LIB)\$(TARGET).LIB \
    190         $(TARGET)exp.def \
     362        $(PDWIN32_LIB)\$(ORGTARGET).lib \
     363        $(ORGTARGET)exp.def \
    191364        $(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION) *.$(TARGET_EXTENSION) \
    192365        $(PDWIN32_BIN)\$(TARGET).sym *.sym \
     
    196369!endif
    197370!endif
    198 
    199 
    200 #
    201 # Include the .depend file.
     371!ifdef SUBDIRS
     372    $(DODIRS) "$(SUBDIRS)"  $(MAKE_CMD) clean
     373!endif
     374
     375
     376#
     377# Common: Include the .depend file.
    202378#   If the depend file don't exists we'll complain about it.
    203379#
     
    210386!   endif
    211387!endif
     388
  • TabularUnified trunk/include/pdwin32.vac3.rel

    r4334 r4620  
    1 # $Id: pdwin32.vac3.rel,v 1.28 2000-09-28 03:16:24 bird Exp $
     1# $Id: pdwin32.vac3.rel,v 1.29 2000-11-19 08:31:20 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    3232# Tool Flags
    3333#
    34 CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -D__i386__  -DTCPV40HDRS -DCOMCTL32UNDOC
    35 CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ /Gx+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -D__i386__  -DTCPV40HDRS -DCOMCTL32UNDOC
    36 CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn- /Gx+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -D__i386__
    37 CFLAGS_WIN32APP  = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
    38 CXXFLAGS_WIN32APP= -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
     34CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+
     35CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ /Gx+
     36CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn- /Gx+
     37CFLAGS_WIN32APP  = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+
     38CXXFLAGS_WIN32APP= -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+
     39
     40CINCLUDES        = -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE)
     41CDEFINES         = -D__WIN32OS2__ -D__WINE__ -D__i386__ -DTCPV40HDRS -DCOMCTL32UNDOC
     42CDEFINES_ODINCRT = -D__WIN32OS2__ -D__WINE__ -D__i386__
     43CDEFINES_WIN32APP= -D__WIN32OS2__ -D__i386__
     44
    3945ASFLAGS          = -Mb -Sc -Sv:ALP
    4046LDFLAGS          = -Q -Si -G5 -O+ -Ge- -Ss+ -W3 -Gm+ /B"/noe /map /packcode /packdata /exepack:2 /nod"
     
    4450IMPLIBFLAGS      = /nologo
    4551ILIBFLAGS        = /quiet /nologo
    46 RCFLAGS          = -s -I. -I$(CPPMAIN)\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
     52RCFLAGS          = -s -I. -I$(CPPMAIN)\include
    4753OS2RCFLAGS       = -r -n
    4854OS2RCLFLAGS      = -x2 -n
  • TabularUnified trunk/include/pdwin32.vac3.tools

    r4334 r4620  
    1 # $Id: pdwin32.vac3.tools,v 1.1 2000-09-28 03:16:24 bird Exp $
     1# $Id: pdwin32.vac3.tools,v 1.2 2000-11-19 08:31:21 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    3030
    3131.c{$(OBJDIR)}.obj:
    32     $(CC) $(CFLAGS) -c -Fo$(OBJDIR)\$(@B).obj $<
     32    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<
    3333
    3434.cpp{$(OBJDIR)}.obj:
    35     $(CXX) $(CXXFLAGS) -Fo$(OBJDIR)\$(@B).obj -c $<
     35    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<
    3636
    3737.asm{$(OBJDIR)}.obj:
     
    3939
    4040.orc{$(OBJDIR)}.orc_asm:
    41     $(RC) $(RCFLAGS) -o $(OBJDIR)\$(@B).orc_asm $<
     41    $(RC) $(RCFLAGS) $(CINCLUDES) -o $(OBJDIR)\$(@B).orc_asm $<
    4242
    4343.orc{$(OBJDIR)}.obj:
    44     $(RC) $(RCFLAGS) -o $(OBJDIR)\$(@B).orc_asm $<
     44    $(RC) $(RCFLAGS) $(CINCLUDES) -o $(OBJDIR)\$(@B).orc_asm $<
    4545    $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $(OBJDIR)\$(@B).orc_asm
    4646
    4747.rc{$(OBJDIR)}.res:
    48     $(OS2RC) $(OS2RCFLAGS) $< $@
     48    $(OS2RC) $(OS2RCFLAGS) $(CINCLUDES:-I=-i ) $< $@
    4949
    5050
     
    5353#
    5454.c.obj:
    55     $(CC) $(CFLAGS) -c $<
     55    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -c $<
    5656
    5757.cpp.obj:
    58     $(CXX) $(CXXFLAGS) -c $<
     58    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -c $<
    5959
    6060.asm.obj:
     
    6262
    6363.orc.asm:
    64     $(RC) $(RCFLAGS) -o $@ $<
     64    $(RC) $(RCFLAGS) $(CINCLUDES) -o $@ $<
    6565
    6666.rc.res:
  • TabularUnified trunk/include/pdwin32.vac36.dbg

    r4477 r4620  
    1 # $Id: pdwin32.vac36.dbg,v 1.21 2000-10-10 18:01:46 sandervl Exp $
     1# $Id: pdwin32.vac36.dbg,v 1.22 2000-11-19 08:31:21 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    3333# Tool Flags
    3434#
    35 CFLAGS           = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__  -D__WINE__ -DDEBUG -D__i386__  -DTCPV40HDRS -DCOMCTL32UNDOC
    36 CXXFLAGS         = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ /Gx+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__  -DTCPV40HDRS -DCOMCTL32UNDOC
    37 CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- /Gx+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__
    38 CFLAGS_WIN32APP  = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
    39 CXXFLAGS_WIN32APP= -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
     35CFLAGS           = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+
     36CXXFLAGS         = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ /Gx+
     37CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- /Gx+
     38CFLAGS_WIN32APP  = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+
     39CXXFLAGS_WIN32APP= -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+
     40
     41CINCLUDES        = -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE)
     42CDEFINES         = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__ -DTCPV40HDRS -DCOMCTL32UNDOC
     43CDEFINES_ODINCRT = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__
     44CDEFINES_WIN32APP= -DDEBUG -D__WIN32OS2__ -D__i386__
    4045
    4146!ifdef DEBUGALL
     
    5156IMPLIBFLAGS      = /nologo
    5257ILIBFLAGS        = /nofree /quiet /nologo
    53 RCFLAGS          = -s -I. -I$(CPPMAIN)\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
     58RCFLAGS          = -s -I. -I$(CPPMAIN)\include
    5459OS2RCFLAGS       = -r -n
    5560OS2RCLFLAGS      = -x2 -n
  • TabularUnified trunk/include/pdwin32.vac36.post

    r4547 r4620  
    1 # $Id: pdwin32.vac36.post,v 1.3 2000-11-01 01:34:19 bird Exp $
     1# $Id: pdwin32.vac36.post,v 1.4 2000-11-19 08:31:21 bird Exp $
    22#
    33# Odin32 API
     
    99# Define NOTEXPDEF to remove the $(TARGET).lib and $(TARGET)exp.def rules.
    1010# Define EXETARGET to make an executable. (This also applies to pdwin32.mk.)
     11# Define LIBTARGET to make an internal library.
    1112# Define LOCALCLEAN if only the local directory is to be clean.
    1213# Define CLEAN2 to invoke a second clean rule named 'clean2'.
    1314# Define NOCLEAN to exclude the clean rule. (Remember to make your own!)
    1415#
    15 # New style: (define NEW_STYLE)
     16# New style: (!defined OLD_STYLE)
    1617# Define NO_ALL_RULE to not make default all rule.
    1718# Define NO_LIB_RULE to not make default lib rule.
    18 # Define NO_DLL_RULE to not make default dll rule.
    19 # Define NO_EXE_RULE to not make default exe rule.
     19# Define NO_MAIN_RULE to not make default main target rule.
    2020# Define NO_LNKFILE_RULE to not make default link-file rule.
    2121# Define NO_DEP_RULE to not make dependencies rule.
    2222# Define NO_CLEAN_RULE to not make clean rule (same as NOCLEAN - use this!).
     23# Define NO_INTERNAL_LIBS to not include libs rule for subdirectories.
     24# Define NO_MAIN_BIN_COPY to not copy the target and sym file to the main
     25#    binary directory. It is only copied to the compiler specific directory.
     26#    Main bin is /bin. Compiler specific bin is /bin/debug, /bin/debug.vac36, etc.
     27# Define ADDITIONAL_DEP to add dependencies rules.
     28#
     29# Define MAKEFILE if the name of the makefile isn't "makefile".
     30# Define DEFFILE to specify another file than $(TARGET).def or $(ORGTARGET).def.
     31#    Define this if your .exe file have a .def file.
     32# Define OS2RES as the names of the OS/2 .res file to create and link
     33#    with the target .dll or .exe.
     34# Define LIBS as a list of all the libraries to link
     35#    with the target .dll or .exe.
     36# Define SUBDIRS when you have subdirectories which should be made.
     37#    dep and lib supports this fully. The rule libs are added, since we assume you
     38#    makes internal libraries in the subdirectories. The libs rule is one of the
     39#    dependencies of the main target.
    2340#
    2441
    2542!ifndef TARGET_EXTENSION
    26 !ifdef EXETARGET
     43!   ifdef EXETARGET
    2744TARGET_EXTENSION=exe
    28 !else
     45!   else
     46!       ifdef LIBTARGET
     47TARGET_EXTENSION=lib
     48!       else
    2949TARGET_EXTENSION=dll
    30 !endif
    31 !endif
    32 
    33 !ifdef NEW_STYLE
     50!       endif
     51!   endif
     52!endif
     53
     54
     55!ifndef OLD_STYLE
     56
     57# Set default MAKEFILE if needed
     58!ifndef MAKEFILE
     59MAKEFILE = makefile
     60!endif
     61
     62# Set default ORGTARGET if needed.
     63!ifndef ORGTARGET
     64ORGTARGET=$(TARGET)
     65!endif
     66
     67# Set default DEFFILE if needed. (Currently for dlls only.)
     68!ifndef DEFFILE
     69!   ifndef EXETARGET
     70DEFFILE = $(ORGTARGET).def
     71!   endif
     72!endif
     73
     74# Set INTLIBS (interal) if SUBDIRS is defined and NO_INTERNAL_LIBS is undefined.
     75!ifdef SUBDIRS
     76!   ifndef NO_INTERNAL_LIBS
     77!       ifndef LIBTARGET
     78INTLIBS = libs
     79!       else
     80INTLIBS = libs_sub
     81!       endif
     82!   endif
     83!endif
     84
     85
     86!ifndef LIBTARGET
    3487!ifndef EXETARGET
    35 
    36 
    37 # All rule - build objs, target dll, copies target to bin and makes libs.
     88###############################################################################
     89# DLL Target
     90###############################################################################
     91
     92#
     93# Dll: All rule - build objs, target dll, copies target to bin and makes libs.
     94#
    3895!ifndef NO_ALL_RULE
    3996all:    $(OBJDIR) \
     97        $(INTLIBS) \
    4098        $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) \
     99        $(OBJDIR)\$(TARGET).sym \
    41100        $(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION) \
     101        $(PDWIN32_BIN)\$(TARGET).sym \
    42102        lib
    43103!endif
    44104
    45105
    46 # Lib rule - build importlibrary (and evt. other libs)
     106#
     107# Dll: Lib rule - build importlibrary (and evt. other libs)
     108#
    47109!ifndef NO_LIB_RULE
    48 lib:    $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    49 !endif
    50 
    51 
    52 # Dll rule - builds the target dll.
    53 !ifndef NO_DLL_RULE
    54 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     110lib:    $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
     111!endif
     112
     113
     114#
     115# Dll: Main target rule - builds the target dll.
     116#
     117!ifndef NO_MAIN_RULE
     118$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
    55119    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    56 !endif
    57 
    58 
    59 # Linker file - creates the parameter file passed on to the linker.
     120!ifdef OS2RES
     121    $(OS2RC) $(OS2RCLFLAGS) $(OS2RES) $@
     122!endif
     123!endif
     124
     125
     126#
     127# Dll: Linker file - creates the parameter file passed on to the linker.
     128#
    60129!ifndef NO_LNKFILE_RULE
    61 $(OBJDIR)\$(TARGET).lrf: makefile
     130$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE)
    62131    @echo Creating file <<$@
    63132/OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
     
    65134$(OBJS)
    66135$(LIBS)
    67 $(TARGET).def
     136$(DEFFILE)
    68137<<keep
    69138!endif
    70139
    71140
    72 # Dep rule - makes depenencies for C, C++ and Asm files.
    73 !ifndef NO_DEP_RULE
    74 dep:
    75     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    76         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    77 !endif
    78 
    79141!else # !ifndef EXETARGET
    80 
    81 
    82 # All rule - build objs, target exe, copies target to bin.
     142###############################################################################
     143# EXE Target
     144###############################################################################
     145
     146#
     147# Exe: All rule - build objs, target exe, copies target to bin.
     148#
    83149!ifndef NO_ALL_RULE
    84150all:    $(OBJDIR) \
     151        $(INTLIBS) \
    85152        $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) \
    86         $(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION)
    87 !endif
    88 
    89 
    90 # Lib rule - dummy rule
     153        $(OBJDIR)\$(TARGET).sym \
     154        $(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION) \
     155        $(PDWIN32_BIN)\$(TARGET).sym
     156!endif
     157
     158
     159#
     160# Exe: Lib rule - dummy rule
     161#
    91162!ifndef NO_LIB_RULE
    92163lib:
     
    94165
    95166
    96 # Exe rule - builds the target exe.
    97 !ifndef NO_EXE_RULE
    98 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     167#
     168# Exe: Main target rule - builds the target exe.
     169#
     170!ifndef NO_MAIN_RULE
     171$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
    99172    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    100 !endif
    101 
    102 
    103 # Linker file - creates the parameter file passed on to the linker.
     173!ifdef OS2RES
     174    $(OS2RC) $(OS2RCLFLAGS) $(OS2RES) $@
     175!endif
     176!endif
     177
     178
     179#
     180# Exe: Linker file - creates the parameter file passed on to the linker.
     181#
    104182!ifndef NO_LNKFILE_RULE
    105 $(OBJDIR)\$(TARGET).lrf: makefile
     183$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE)
    106184    @echo Creating file <<$@
    107185/OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    108186/MAP:$(OBJDIR)\$(TARGET).map
    109187$(OBJS)
    110 $(LIBS)
    111 $(TARGET).def
     188$(LIBS) $(DEFFILE)
    112189<<keep
    113190!endif
    114191
    115192
    116 # Dep rule - makes depenencies for C, C++ and Asm files.
    117 !ifndef NO_DE_PRULE
    118 dep:
    119     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    120         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    121 !endif
    122 
    123 
    124 !endif # EXETARGET
    125 !endif # NEW_STYLE
    126 
    127 
    128 # Copy library rule.
    129 !ifndef ORGTARGET
    130 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    131 !else
     193!endif # !ifndef EXETARGET !else
     194!else # !ifndef LIBTARGET
     195###############################################################################
     196# LIB target (internal object library)
     197###############################################################################
     198
     199#
     200# Localcleanup is default for internal object libraries.
     201#
     202LOCALCLEAN = 1
     203
     204
     205#
     206# Lib: All rule - build objs and target library.
     207#
     208!ifndef NO_ALL_RULE
     209all:    $(OBJDIR) \
     210        $(INTLIBS) \
     211        $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
     212!endif
     213
     214
     215#
     216# Lib: Lib rule - dummy rule
     217#
     218!ifndef NO_LIB_RULE
     219lib:
     220!endif
     221
     222
     223#
     224# Lib: Internal library rule. Same as the all rule.
     225#
     226!ifndef NO_INTERNAL_LIBS
     227libs: all
     228!endif
     229
     230
     231#
     232# Lib: Main target rule - builds the target internal library.
     233#
     234!ifndef NO_MAIN_RULE
     235$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS)
     236    $(RM) $@
     237    $(ILIB) $(ILIBFLAGS) $@ @<<
     238$(OBJS:  = &^
     239)
     240$(OBJDIR)\$(@B).lst
     241<<
     242!endif
     243
     244
     245!endif # !ifndef LIBTARGET
     246
     247
     248###############################################################################
     249# Common rules for both exe and dll, new style
     250###############################################################################
     251
     252#
     253# Common (new): Dep rule - makes depenencies for C, C++ and Asm files.
     254#
     255!ifndef NO_DEP_RULE
     256dep: dep_internal $(ADDITIONAL_DEP)
     257dep_internal:
     258    $(DEPEND) $(CINCLUDES) *.c *.cpp *.h *.asm *.inc \
     259        *.rc *.dlg $(PDWIN32_INCLUDE)\*.h -robj *.orc
     260!ifdef SUBDIRS
     261    $(DODIRS) "$(SUBDIRS)"  $(MAKE_CMD) dep
     262!endif
     263!endif
     264
     265
     266#
     267# Common: Internal library rule. Make libraries in subdirectories.
     268#   For makefiles with subdirectories is common to have make libraries in subdirectories.
     269#
     270!ifndef NO_INTERNAL_LIBS
     271!ifdef INTLIBS
     272$(INTLIBS):
     273    $(DODIRS) "$(SUBDIRS)"  $(MAKE_CMD) libs
     274!endif
     275!endif
     276
     277!endif # OLD_STYLE
     278
     279###############################################################################
     280# Common rules for both exe and dll, old and new style.
     281###############################################################################
     282
     283#
     284# Common: Copy library rule.
     285#
    132286$(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
    133 !endif
    134287    $(CP) $** $@
    135288
    136289
    137 # Copy dll rule.
    138 !ifndef EXETARGET
     290#
     291# Common: Copy dll/exe rule.
     292#
    139293$(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION): $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    140 !else
    141 $(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION): $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    142 !endif
     294    $(CP) $** $@
     295!ifndef NO_MAIN_BIN_COPY
     296    -$(CP) $** $(@D)..\..\$(@F)
     297!endif
     298
     299
     300#
     301# Common: Copy sym rule.
     302#
     303$(PDWIN32_BIN)\$(TARGET).sym: $(OBJDIR)\$(TARGET).sym
     304    $(CP) $** $@
     305!ifndef NO_MAIN_BIN_COPY
     306    -$(CP) $** $(@D)..\..\$(@F)
     307!endif
     308
     309
     310#
     311# Common: Make sym file rule.
     312#
     313$(OBJDIR)\$(TARGET).sym: $(OBJDIR)\$(TARGET).map
    143314    cd $(OBJDIR)
    144315    $(MAPSYM) $(TARGET).map
    145316    cd ..\..
    146     $(CP) $(OBJDIR)\$(TARGET).sym $(PDWIN32_BIN)
    147     $(CP) $** $@
    148     -$(CP) $** $(@D)..\..\$(@F)
    149     -$(CP) $(OBJDIR)\$(TARGET).sym $(@D)..\..
    150 
    151 
     317
     318
     319#
     320# Common: Make library from the <>exp.def or the <>.def file.
     321#
    152322!ifndef NOTEXPDEF
    153 # make library from the <>exp.def file.
    154 !ifndef ORGTARGET
    155 $(TARGET).LIB: $(TARGET)exp.def
     323$(ORGTARGET).lib: $(ORGTARGET)exp.def
     324    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    156325!else
    157 $(ORGTARGET).LIB: $(ORGTARGET)exp.def
    158 !endif
     326$(TARGET).lib: $(DEFFILE)
    159327    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    160     $(CP) $@ $(PDWIN32_LIB)
    161 
    162 
    163 # make the <>exp.def file.
    164 !ifndef ORGTARGET
    165 $(TARGET)exp.def: $(TARGET).def
    166 !else
    167 $(ORGTARGET)exp.def: $(ORGTARGET).def
    168 !endif
     328!endif
     329
     330
     331#
     332# Common: Make the <>exp.def file.
     333#
     334!ifndef NOTEXPDEF
     335$(ORGTARGET)exp.def: $(DEFFILE)
    169336    $(IMPDEF) $** $@
    170337!endif
    171338
    172339
    173 # Create the object directory.
     340#
     341# Common: Create the object directory.
     342#
    174343$(OBJDIR):
    175344    @if not exist bin $(MKDIR) bin
     
    178347
    179348#
    180 # General clean rule. To clean more add it to CLEANEXTRAS!
     349# Common: General clean rule. To clean more add it to CLEANEXTRAS!
    181350#
    182351!ifndef NOCLEAN
     
    186355clean:  clean2
    187356!endif
    188     $(RM) *.LIB *.res *.map *.pch \
     357    $(RM) *.lib *.res *.map *.pch \
    189358!if "$(OBJDIR)" != ""
    190359     $(OBJDIR)\* \
    191360!endif
    192361!ifndef LOCALCLEAN
    193         $(PDWIN32_LIB)\$(TARGET).LIB \
    194         $(TARGET)exp.def \
     362        $(PDWIN32_LIB)\$(ORGTARGET).lib \
     363        $(ORGTARGET)exp.def \
    195364        $(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION) *.$(TARGET_EXTENSION) \
    196365        $(PDWIN32_BIN)\$(TARGET).sym *.sym \
     
    200369!endif
    201370!endif
    202 
    203 
    204 #
    205 # Include the .depend file.
     371!ifdef SUBDIRS
     372    $(DODIRS) "$(SUBDIRS)"  $(MAKE_CMD) clean
     373!endif
     374
     375
     376#
     377# Common: Include the .depend file.
    206378#   If the depend file don't exists we'll complain about it.
    207379#
     
    214386!   endif
    215387!endif
     388
  • TabularUnified trunk/include/pdwin32.vac36.rel

    r4334 r4620  
    1 # $Id: pdwin32.vac36.rel,v 1.19 2000-09-28 03:16:24 bird Exp $
     1# $Id: pdwin32.vac36.rel,v 1.20 2000-11-19 08:31:21 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    3232# Tool Flags
    3333#
    34 CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -D__i386__  -DTCPV40HDRS -DCOMCTL32UNDOC
    35 CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ /Gx+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -D__i386__  -DTCPV40HDRS -DCOMCTL32UNDOC
    36 CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn- /Gx+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -D__i386__
    37 CFLAGS_WIN32APP  = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
    38 CXXFLAGS_WIN32APP= -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
     34CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+
     35CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ /Gx+
     36CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn- /Gx+
     37CFLAGS_WIN32APP  = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+
     38CXXFLAGS_WIN32APP= -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+
     39
     40CINCLUDES        = -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE)
     41CDEFINES         = -D__WIN32OS2__ -D__WINE__ -D__i386__ -DTCPV40HDRS -DCOMCTL32UNDOC
     42CDEFINES_ODINCRT = -D__WIN32OS2__ -D__WINE__ -D__i386__
     43CDEFINES_WIN32APP= -D__WIN32OS2__ -D__i386__
     44
    3945ASFLAGS          = -Mb -Sc -Sv:ALP
    4046LDFLAGS          = -Q -Si -G5 -O+ -Ge- -Ss+ -W3 -Gm+ /B"/noe /map /packcode /packdata /exepack:2 /nod"
     
    4450IMPLIBFLAGS      = /nologo
    4551ILIBFLAGS        = /nofree /quiet /nologo
    46 RCFLAGS          = -s -I. -I$(CPPMAIN)\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
     52RCFLAGS          = -s -I. -I$(CPPMAIN)\include
    4753OS2RCFLAGS       = -r -n
    4854OS2RCLFLAGS      = -x2 -n
  • TabularUnified trunk/include/pdwin32.vac36.tools

    r4334 r4620  
    1 # $Id: pdwin32.vac36.tools,v 1.1 2000-09-28 03:16:24 bird Exp $
     1# $Id: pdwin32.vac36.tools,v 1.2 2000-11-19 08:31:21 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    3030
    3131.c{$(OBJDIR)}.obj:
    32     $(CC) $(CFLAGS) -c -Fo$(OBJDIR)\$(@B).obj $<
     32    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<
    3333
    3434.cpp{$(OBJDIR)}.obj:
    35     $(CXX) $(CXXFLAGS) -Fo$(OBJDIR)\$(@B).obj -c $<
     35    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<
    3636
    3737.asm{$(OBJDIR)}.obj:
     
    3939
    4040.orc{$(OBJDIR)}.orc_asm:
    41     $(RC) $(RCFLAGS) -o $(OBJDIR)\$(@B).orc_asm $<
     41    $(RC) $(RCFLAGS) $(CINCLUDES) -o $(OBJDIR)\$(@B).orc_asm $<
    4242
    4343.orc{$(OBJDIR)}.obj:
    44     $(RC) $(RCFLAGS) -o $(OBJDIR)\$(@B).orc_asm $<
     44    $(RC) $(RCFLAGS) $(CINCLUDES) -o $(OBJDIR)\$(@B).orc_asm $<
    4545    $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $(OBJDIR)\$(@B).orc_asm
    4646
    4747.rc{$(OBJDIR)}.res:
    48     $(OS2RC) $(OS2RCFLAGS) $< $@
     48    $(OS2RC) $(OS2RCFLAGS) $(CINCLUDES:-I=-i ) $< $@
    4949
    5050
     
    5353#
    5454.c.obj:
    55     $(CC) $(CFLAGS) -c $<
     55    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -c $<
    5656
    5757.cpp.obj:
    58     $(CXX) $(CXXFLAGS) -c $<
     58    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -c $<
    5959
    6060.asm.obj:
     
    6262
    6363.orc.asm:
    64     $(RC) $(RCFLAGS) -o $@ $<
     64    $(RC) $(RCFLAGS) $(CINCLUDES) -o $@ $<
    6565
    6666.rc.res:
  • TabularUnified trunk/src/wing32/makefile

    r3864 r4620  
    1 # $Id: makefile,v 1.8 2000-07-19 19:05:26 sandervl Exp $
     1# $Id: makefile,v 1.9 2000-11-19 08:35:50 bird Exp $
    22
    33#
     
    77#
    88
    9 # Directory macros.
    10 PDWIN32_INCLUDE = ..\..\include
    11 PDWIN32_LIB     = ..\..\lib
    12 PDWIN32_BIN     = ..\..\$(OBJDIR)
    13 PDWIN32_TOOLS   = ..\..\tools\bin
     9
     10#
     11# Compiler, tools, and interference rules.
     12#
     13!include ../../include/pdwin32.mk
    1414
    1515
    16 # Compiler, tools, and interference rules.
    17 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    18 
    19 
    20 # Flag overloads and local macros.
    21 CLEANEXTRAS = lz32rsrc.asm
    22 ASFLAGS     = -Sc -Sv:ALP
    23 
    24 
    25 # Object files. All objects should be prefixed with $(OBJDIR)!
     16#
     17# Object files. Prefix with OBJDIR and one space before the '\'.
     18#
    2619OBJS = \
    2720$(OBJDIR)\initterm.obj \
     
    3023
    3124
     25#
     26# Libraries. One space before the '\'.
     27#
     28LIBS = \
     29$(PDWIN32_LIB)/kernel32.lib \
     30$(PDWIN32_LIB)/user32.lib \
     31$(PDWIN32_LIB)/gdi32.lib \
     32$(PDWIN32_LIB)/$(ODINCRT).lib \
     33OS2386.LIB \
     34$(RTLLIB_O)
     35
     36
     37#
    3238# Target name - name of the dll without extention and path.
     39#
    3340TARGET  = wing32
    3441
    3542
    36 # All rule - build objs, target dll, copies dll to bin and makes libs.
    37 all:    $(OBJDIR) \
    38         $(OBJDIR)\$(TARGET).dll \
    39         $(PDWIN32_BIN)\$(TARGET).dll \
    40         lib
     43#
     44# Includes the common rules.
     45#
     46!include $(PDWIN32_INCLUDE)/pdwin32.post
    4147
    4248
    43 # Lib rule - build importlibrary (and evt. other libs)
    44 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    45 
    46 
    47 # Dll rule - builds the target dll.
    48 $(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
    49     $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    50 
    51 
    52 # Linker file - creates the parameter file passed on to the linker.
    53 $(OBJDIR)\$(TARGET).lrf: makefile
    54     @echo Creating file <<$@
    55 /OUT:$(OBJDIR)\$(TARGET).dll
    56 /MAP:$(OBJDIR)\$(TARGET).map
    57 $(OBJS)
    58 $(PDWIN32_LIB)/user32.lib
    59 $(PDWIN32_LIB)/gdi32.lib
    60 $(PDWIN32_LIB)/kernel32.lib
    61 $(PDWIN32_LIB)/$(ODINCRT).lib
    62 OS2386.LIB
    63 $(RTLLIB_O)
    64 $(TARGET).def
    65 <<keep
    66 
    67 
    68 # Dep rule - makes depenencies for C, C++ and Asm files.
    69 dep:
    70     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    71         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    72 
    73 
    74 # Includes the common rules.
    75 !include $(PDWIN32_INCLUDE)/pdwin32.post
    76 
  • TabularUnified trunk/src/wininet/makefile

    r3994 r4620  
    1 # $Id: makefile,v 1.9 2000-08-11 10:57:59 sandervl Exp $
     1# $Id: makefile,v 1.10 2000-11-19 08:35:50 bird Exp $
    22
    33#
     
    77#
    88
    9 # Directory macros.
    10 PDWIN32_INCLUDE = ..\..\include
    11 PDWIN32_LIB     = ..\..\lib
    12 PDWIN32_BIN     = ..\..\$(OBJDIR)
    13 PDWIN32_TOOLS   = ..\..\tools\bin
     9
     10#
     11# Compiler, tools, and interference rules.
     12#
     13!include ../../include/pdwin32.mk
    1414
    1515
    16 # Compiler, tools, and interference rules.
    17 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    18 
    19 
    20 # Flag overloads and local macros.
    21 CLEANEXTRAS = mprrsrc.asm
    22 
    23 
    24 # Object files. All objects should be prefixed with $(OBJDIR)!
     16#
     17# Object files. Prefix with OBJDIR and one space before the '\'.
     18#
    2519OBJS = \
    2620$(OBJDIR)\wininet.obj \
     
    2923$(OBJDIR)\initterm.obj \
    3024$(OBJDIR)\internet.obj \
    31 $(OBJDIR)\wininetrsrc.obj 
     25$(OBJDIR)\wininetrsrc.obj
    3226
    3327
     28#
     29# Libraries. One space before the '\'.
     30#
     31LIBS = \
     32$(PDWIN32_LIB)/kernel32.lib \
     33$(PDWIN32_LIB)/user32.lib \
     34$(PDWIN32_LIB)/$(ODINCRT).lib \
     35$(PDWIN32_LIB)/wsock32.lib \
     36OS2386.LIB \
     37$(RTLLIB_O)
     38
     39
     40#
    3441# Target name - name of the dll without extention and path.
     42#
    3543TARGET = wininet
    3644
    3745
    38 # All rule - build objs, target dll, copies dll to bin and makes libs.
    39 all:    $(OBJDIR) \
    40         $(OBJDIR)\$(TARGET).dll \
    41         $(PDWIN32_BIN)\$(TARGET).dll \
    42         lib
    43 
    44 
    45 # Lib rule - build importlibrary (and evt. other libs)
    46 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    47 
    48 
    49 # Dll rule - builds the target dll.
    50 $(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
    51     $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    52 
    53 
    54 # Linker file - creates the parameter file passed on to the linker.
    55 $(OBJDIR)\$(TARGET).lrf: makefile
    56     @echo Creating file <<$@
    57 /OUT:$(OBJDIR)\$(TARGET).dll
    58 /MAP:$(OBJDIR)\$(TARGET).map
    59 $(OBJS)
    60 $(PDWIN32_LIB)/kernel32.lib \
    61 $(PDWIN32_LIB)/user32.lib \
    62 $(PDWIN32_LIB)/$(ODINCRT).lib \
    63 $(PDWIN32_LIB)/wsock32.lib
    64 OS2386.LIB $(RTLLIB_O)
    65 $(TARGET).def
    66 <<keep
    67 
    68 
    69 # Dep rule - makes depenencies for C, C++ and Asm files.
    70 dep:
    71     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    72         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    73 
    74 
     46#
    7547# Includes the common rules.
     48#
    7649!include $(PDWIN32_INCLUDE)/pdwin32.post
    7750
  • TabularUnified trunk/src/winmm/makefile

    r3864 r4620  
    1 # $Id: makefile,v 1.19 2000-07-19 19:05:26 sandervl Exp $
     1# $Id: makefile,v 1.20 2000-11-19 08:35:50 bird Exp $
    22
    33#
     
    77#
    88
    9 # Directory macros.
    10 PDWIN32_INCLUDE = ..\..\include
    11 PDWIN32_LIB     = ..\..\lib
    12 PDWIN32_BIN     = ..\..\$(OBJDIR)
    13 PDWIN32_TOOLS   = ..\..\tools\bin
     9
     10#
     11# Compiler, tools, and interference rules.
     12#
     13!include ../../include/pdwin32.mk
    1414
    1515
    16 # Compiler, tools, and interference rules.
    17 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    18 
    19 
    20 # Flag overloads and local macros.
    21 CLEANEXTRAS = winmmrsrc.asm
    22 
    23 
    24 # Object files. All objects should be prefixed with $(OBJDIR)!
     16#
     17# Object files. Prefix with OBJDIR and one space before the '\'.
     18#
    2519OBJS = \
    2620$(OBJDIR)\os2timer.obj \
     
    4640
    4741
     42#
     43# Libraries. One space before the '\'.
     44#
     45LIBS = \
     46$(PDWIN32_LIB)/pmwinx.lib \
     47mmpm2.lib \
     48$(PDWIN32_LIB)/kernel32.lib \
     49$(PDWIN32_LIB)/user32.lib \
     50$(PDWIN32_LIB)/$(ODINCRT).lib \
     51OS2386.LIB \
     52$(RTLLIB_O)
     53
     54
     55#
    4856# Target name - name of the dll without extention and path.
     57#
    4958TARGET = winmm
    5059
    51 LDFLAGS = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /map /NOD /dbgpack /packcode /packdata /exepack:2"
    5260
    53 # All rule - build objs, target dll, copies dll to bin and makes libs.
    54 all:    $(OBJDIR) \
    55         $(OBJDIR)\$(TARGET).dll \
    56         $(PDWIN32_BIN)\$(TARGET).dll \
    57         lib
    58 
    59 
    60 # Lib rule - build importlibrary (and evt. other libs)
    61 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    62 
    63 
    64 # Dll rule - builds the target dll.
    65 $(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
    66     $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    67 
    68 
    69 # Linker file - creates the parameter file passed on to the linker.
    70 $(OBJDIR)\$(TARGET).lrf: makefile
    71     @echo Creating file <<$@
    72 /OUT:$(OBJDIR)\$(TARGET).dll
    73 /MAP:$(OBJDIR)\$(TARGET).map
    74 $(OBJS)
    75 $(PDWIN32_LIB)/pmwinx.lib
    76 mmpm2.lib
    77 $(PDWIN32_LIB)/kernel32.lib
    78 $(PDWIN32_LIB)/user32.lib
    79 $(PDWIN32_LIB)/$(ODINCRT).lib
    80 OS2386.LIB
    81 $(RTLLIB_O)
    82 $(TARGET).def
    83 <<keep
    84 
    85 
    86 # Dep rule - makes depenencies for C, C++ and Asm files.
    87 dep:
    88     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    89         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    90 
    91 
     61#
    9262# Includes the common rules.
     63#
    9364!include $(PDWIN32_INCLUDE)/pdwin32.post
    9465
  • TabularUnified trunk/src/winspool/makefile

    r4594 r4620  
    1 # $Id: makefile,v 1.17 2000-11-15 10:54:23 sandervl Exp $
     1# $Id: makefile,v 1.18 2000-11-19 08:35:50 bird Exp $
    22
    33#
     
    77#
    88
    9 # Directory macros.
    10 PDWIN32_INCLUDE = ..\..\include
    11 PDWIN32_LIB     = ..\..\lib
    12 PDWIN32_BIN     = ..\..\$(OBJDIR)
    13 PDWIN32_TOOLS   = ..\..\tools\bin
     9
     10#
     11# Compiler, tools, and interference rules.
     12#
     13!include ../../include/pdwin32.mk
    1414
    1515
    16 # Compiler, tools, and interference rules.
    17 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    18 
    19 
    20 # Flag overloads and local macros.
    21 CLEANEXTRAS = winspoolrsrc.asm
    22 
    23 
    24 # Object files. All objects should be prefixed with $(OBJDIR)!
     16#
     17# Object files. Prefix with OBJDIR and one space before the '\'.
     18#
    2519OBJS = \
    2620$(OBJDIR)\winspool.obj \
    2721$(OBJDIR)\oslibspl.obj \
    2822$(OBJDIR)\winspoolrsrc.obj \
    29 $(PDWIN32_LIB)\dllentry.obj
     23$(DLLENTRY)
    3024
    3125
     26#
     27# Libraries. One space before the '\'.
     28#
     29LIBS = \
     30$(PDWIN32_LIB)/kernel32.lib \
     31$(PDWIN32_LIB)/pmwinx.lib \
     32$(PDWIN32_LIB)/user32.lib \
     33$(PDWIN32_LIB)/$(ODINCRT).lib \
     34OS2386.LIB \
     35$(RTLLIB_O)
     36
     37
     38#
    3239# Target name - name of the dll without extention and path.
     40#
    3341TARGET = winspool
    3442
    3543
    36 # All rule - build objs, target dll, copies dll to bin and makes libs.
    37 all:    $(OBJDIR) \
    38         $(OBJDIR)\$(TARGET).dll \
    39         $(PDWIN32_BIN)\$(TARGET).dll \
    40         lib
    41 
    42 
    43 # Lib rule - build importlibrary (and evt. other libs)
    44 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    45 
    46 
    47 # Dll rule - builds the target dll.
    48 $(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
    49     -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    50 
    51 
    52 # Linker file - creates the parameter file passed on to the linker.
    53 $(OBJDIR)\$(TARGET).lrf: makefile
    54     @echo Creating file <<$@
    55 /OUT:$(OBJDIR)\$(TARGET).dll
    56 /MAP:$(OBJDIR)\$(TARGET).map
    57 $(OBJS)
    58 $(PDWIN32_LIB)/kernel32.lib
    59 $(PDWIN32_LIB)/pmwinx.lib
    60 $(PDWIN32_LIB)/user32.lib
    61 $(PDWIN32_LIB)/$(ODINCRT).lib
    62 OS2386.LIB
    63 $(RTLLIB_O)
    64 $(TARGET).def
    65 <<keep
    66 
    67 
    68 # Dep rule - makes depenencies for C, C++ and Asm files.
    69 dep:
    70     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    71         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    72 
    73 
     44#
    7445# Includes the common rules.
     46#
    7547!include $(PDWIN32_INCLUDE)/pdwin32.post
    7648
  • TabularUnified trunk/src/wnaspi32/makefile

    r4265 r4620  
    1 # $Id: makefile,v 1.11 2000-09-15 13:25:49 sandervl Exp $
     1# $Id: makefile,v 1.12 2000-11-19 08:35:50 bird Exp $
    22
    33#
     
    77#
    88
    9 # Directory macros.
    10 PDWIN32_INCLUDE = ..\..\include
    11 PDWIN32_LIB     = ..\..\lib
    12 PDWIN32_BIN     = ..\..\$(OBJDIR)
    13 PDWIN32_TOOLS   = ..\..\tools\bin
     9
     10#
     11# Compiler, tools, and interference rules.
     12#
     13!include ../../include/pdwin32.mk
    1414
    1515
    16 # Compiler, tools, and interference rules.
    17 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    18 
    19 
    20 # Flag overloads and local macros.
    21 CLEANEXTRAS = wnaspi32rsrc.asm
    22 
    23 
    24 # Object files. All objects should be prefixed with $(OBJDIR)!
     16#
     17# Object files. Prefix with OBJDIR and one space before the '\'.
     18#
    2519OBJS = \
    2620$(OBJDIR)\aspilib.obj \
     
    3024
    3125
     26#
     27# Libraries. One space before the '\'.
     28#
     29LIBS = \
     30$(PDWIN32_LIB)/kernel32.lib \
     31$(PDWIN32_LIB)/$(ODINCRT).lib \
     32$(PDWIN32_LIB)/advapi32.lib \
     33OS2386.LIB \
     34$(RTLLIB_O)
     35
     36
     37#
    3238# Target name - name of the dll without extention and path.
     39#
    3340TARGET = wnaspi32
    3441
    3542
    36 # All rule - build objs, target dll, copies dll to bin and makes libs.
    37 all:    $(OBJDIR) \
    38         $(OBJDIR)\$(TARGET).dll \
    39         $(PDWIN32_BIN)\$(TARGET).dll \
    40         lib
    41 
    42 
    43 # Lib rule - build importlibrary (and evt. other libs)
    44 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    45 
    46 
    47 # Dll rule - builds the target dll.
    48 $(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
    49     $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    50 
    51 
    52 # Linker file - creates the parameter file passed on to the linker.
    53 $(OBJDIR)\$(TARGET).lrf: makefile
    54     @echo Creating file <<$@
    55 /OUT:$(OBJDIR)\$(TARGET).dll
    56 /MAP:$(OBJDIR)\$(TARGET).map
    57 $(OBJS)
    58 $(PDWIN32_LIB)/kernel32.lib
    59 $(PDWIN32_LIB)/$(ODINCRT).lib
    60 OS2386.LIB
    61 $(RTLLIB_O)
    62 $(PDWIN32_LIB)/advapi32.lib
    63 $(TARGET).def
    64 <<keep
    65 
    66 
    67 # Dep rule - makes depenencies for C, C++ and Asm files.
    68 dep:
    69     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    70         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    71 
    72 
     43#
    7344# Includes the common rules.
     45#
    7446!include $(PDWIN32_INCLUDE)/pdwin32.post
    7547
  • TabularUnified trunk/src/wnetap32/makefile

    r4362 r4620  
    1 # $Id: makefile,v 1.13 2000-10-02 13:03:00 phaller Exp $
     1# $Id: makefile,v 1.14 2000-11-19 08:35:50 bird Exp $
    22
    33#
     
    77#
    88
    9 # Directory macros.
    10 PDWIN32_INCLUDE = ..\..\include
    11 PDWIN32_LIB     = ..\..\lib
    12 PDWIN32_BIN     = ..\..\$(OBJDIR)
    13 PDWIN32_TOOLS   = ..\..\tools\bin
     9
     10#
     11# Compiler, tools, and interference rules.
     12#
     13!include ../../include/pdwin32.mk
    1414
    1515
    16 # Compiler, tools, and interference rules.
    17 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    18 
    19 
    20 # Flag overloads and local macros.
    21 CLEANEXTRAS = netapi32rsrc.asm
    22 
    23 
    24 # Object files. All objects should be prefixed with $(OBJDIR)!
     16#
     17# Object files. Prefix with OBJDIR and one space before the '\'.
     18#
    2519OBJS = \
    2620$(OBJDIR)\wnetap32.obj \
     
    3024
    3125
     26#
     27# Libraries. One space before the '\'.
     28#
     29LIBS = \
     30$(PDWIN32_LIB)/kernel32.lib \
     31$(PDWIN32_LIB)/user32.lib \
     32$(PDWIN32_LIB)/$(ODINCRT).lib \
     33OS2386.LIB \
     34$(RTLLIB_O)
     35
     36
     37#
    3238# Target and original target names - names of the dll without extention and path
     39#
    3340TARGET      = wnetap32
    3441ORGTARGET   = netapi32
    3542
    3643
    37 # All rule - build objs, target dll, copies dll to bin and makes libs.
    38 all:    $(OBJDIR) \
    39         $(OBJDIR)\$(TARGET).dll \
    40         $(PDWIN32_BIN)\$(TARGET).dll \
    41         lib
    42 
    43 
    44 # Lib rule - build importlibrary (and evt. other libs)
    45 lib: $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
    46 
    47 
    48 # Dll rule - builds the target dll.
    49 $(OBJDIR)\$(TARGET).dll: $(OBJS) $(ORGTARGET).def $(OBJDIR)\$(TARGET).lrf
    50     $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    51 
    52 
    53 # Linker file - creates the parameter file passed on to the linker.
    54 $(OBJDIR)\$(TARGET).lrf: makefile
    55     @echo Creating file <<$@
    56 /OUT:$(OBJDIR)\$(TARGET).dll
    57 /MAP:$(OBJDIR)\$(TARGET).map
    58 $(OBJS)
    59 $(PDWIN32_LIB)/kernel32.lib
    60 $(PDWIN32_LIB)/user32.lib
    61 $(PDWIN32_LIB)/$(ODINCRT).lib
    62 OS2386.LIB $(RTLLIB_O)
    63 $(ORGTARGET).def
    64 <<keep
    65 
    66 
    67 # Dep rule - makes depenencies for C, C++ and Asm files.
    68 dep:
    69     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    70         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    71 
    72 
     44#
    7345# Includes the common rules.
     46#
    7447!include $(PDWIN32_INCLUDE)/pdwin32.post
    7548
  • TabularUnified trunk/src/wsock32/makefile

    r3864 r4620  
    1 # $Id: makefile,v 1.27 2000-07-19 19:05:27 sandervl Exp $
     1# $Id: makefile,v 1.28 2000-11-19 08:35:49 bird Exp $
    22
    33#
     
    77#
    88
    9 # Directory macros.
    10 PDWIN32_INCLUDE = ..\..\include
    11 PDWIN32_LIB     = ..\..\lib
    12 PDWIN32_BIN     = ..\..\$(OBJDIR)
    13 PDWIN32_TOOLS   = ..\..\tools\bin
     9
     10#
     11# Compiler, tools, and interference rules.
     12#
     13!include ../../include/pdwin32.mk
    1414
    1515
    16 # Compiler, tools, and interference rules.
    17 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     16#
     17# Overrides.
     18#
     19CXXFLAGS = $(CXXFLAGS) -DNEW_ASYNC
    1820
    1921
    20 # Flag overloads and local macros.
    21 CLEANEXTRAS = wsock32rsrc.asm
    22 
    23 
    24 # Object files. All objects should be prefixed with $(OBJDIR)!
     22#
     23# Object files. Prefix with OBJDIR and one space before the '\'.
     24#
    2525OBJS = \
    2626$(OBJDIR)\wsock32.obj \
     
    3535
    3636
     37#
     38# Libraries. One space before the '\'.
     39#
     40LIBS = \
     41$(PDWIN32_LIB)/kernel32.lib \
     42$(PDWIN32_LIB)/user32.lib \
     43$(PDWIN32_LIB)/$(ODINCRT).lib \
     44so32dll.lib \
     45tcp32dll.lib \
     46OS2386.LIB \
     47$(RTLLIB_O)
     48
     49
     50#
    3751# Target name - name of the dll without extention and path.
     52#
    3853TARGET = wsock32
    3954
    40 CXXFLAGS = $(CXXFLAGS) -DNEW_ASYNC
    4155
    42 
    43 # All rule - build objs, target dll, copies dll to bin and makes libs.
    44 all:    $(OBJDIR) \
    45         $(OBJDIR)\$(TARGET).dll \
    46         $(PDWIN32_BIN)\$(TARGET).dll \
    47         lib
    48 
    49 
    50 # Lib rule - build importlibrary (and evt. other libs)
    51 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    52 
    53 
    54 # Dll rule - builds the target dll.
    55 $(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
    56     $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    57 
    58 
    59 # Linker file - creates the parameter file passed on to the linker.
    60 $(OBJDIR)\$(TARGET).lrf: makefile
    61     @echo Creating file <<$@
    62 /OUT:$(OBJDIR)\$(TARGET).dll
    63 /MAP:$(OBJDIR)\$(TARGET).map
    64 $(OBJS)
    65 $(TARGET).def
    66 so32dll.lib
    67 tcp32dll.lib
    68 $(PDWIN32_LIB)\kernel32.lib
    69 $(PDWIN32_LIB)/user32.lib
    70 $(PDWIN32_LIB)/$(ODINCRT).lib
    71 OS2386.LIB
    72 $(RTLLIB_O)
    73 <<keep
    74 
    75 
    76 # Dep rule - makes depenencies for C, C++ and Asm files.
    77 dep:
    78     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    79         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    80 
    81 
     56#
    8257# Includes the common rules.
     58#
    8359!include $(PDWIN32_INCLUDE)/pdwin32.post
    8460
  • TabularUnified trunk/tools/SDF/makefile

    r4332 r4620  
    1 # $Id: makefile,v 1.2 2000-09-28 03:06:27 bird Exp $
     1# $Id: makefile,v 1.3 2000-11-19 08:25:50 bird Exp $
    22
    33#
     
    99
    1010
    11 # include common definitions
     11#
     12# Directory macros.
     13#
    1214PDWIN32_INCLUDE = ..\..\include
     15PDWIN32_LIB     = ..\..\lib
     16PDWIN32_BIN     = ..\bin
    1317PDWIN32_TOOLS   = ..\bin
     18PDWIN32_TCOMMON = ..\common
     19
     20
     21#
     22# Tell buildenvironment that we're makeing an .exe.
     23# Tell buildenvironment that we should not copy this into /bin.
     24#
     25EXETARGET = 1
     26NO_MAIN_BIN_COPY = 1
     27
     28
     29#
     30# Compiler, tools, and interference rules.
     31#
    1432!include $(PDWIN32_INCLUDE)\pdwin32.mk
     33!include $(PDWIN32_TCOMMON)\common.mk
    1534
    16 # Addjust common definitions
    17 CINCLUDES= -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win -I..\common
    18 !ifdef DEBUG
    19 CFLAGS   = $(CFLAGS)   -Ge+ -Tx+ $(CINCLUDES) -Wall+ppt-ppc-inl-cnv-gnr-vft-
    20 CXXFLAGS = $(CXXFLAGS) -Ge+ -Gx- -Tx+ $(CINCLUDES) -Wall+ppt-ppc-inl-cnv-gnr-vft-
    21 LDFLAGS  = $(LDFLAGS)  -Ge+ -Fe$@ /B"/MAP:full"
    22 !else
    23 CFLAGS   = $(CFLAGS)   -Ge+ -Tx+ $(CINCLUDES) -Wall+ppt-ppc-inl-cnv-gnr-vft-
    24 CXXFLAGS = $(CXXFLAGS) -Ge+ -Gx- -Tx+ $(CINCLUDES) -Wall+ppt-ppc-inl-cnv-gnr-vft-
    25 LDFLAGS  = $(LDFLAGS)  -Ge+ -Fe$@ /B"/MAP:full"
     35
     36#
     37# Flag overrides.
     38#
     39!if "$(VAC3)" == "1" || "$(VAC36)" == "1"
     40CFLAGS      = $(CFLAGS)        -Wall+ppt-ppc-inl-cnv-gnr-vft-
     41CXXFLAGS    = $(CXXFLAGS) -Gx- -Wall+ppt-ppc-inl-cnv-gnr-vft-
    2642!endif
    2743
    2844
    29 
    30 all: sdf.exe ..\bin\sdf.exe
    31 
    32 
    33 sdf.exe: sdf.obj ..\common\commonicc.lib
    34    $(LD) $(LDFLAGS) $** $(RTLLIB) os2386.lib
    35 
    36 ..\bin\sdf.exe: sdf.exe
    37    $(CP) $** $@
    38 
    39 dep:
    40     $(DEPEND) $(CINCLUDES) -I *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
    41         *.c *.cpp
    42 
    43 clean:
    44     @$(RM) *.obj *.exe *.map *.pch *.log
     45#
     46# Object files. Prefix with OBJDIR and one space before the '\'.
     47#
     48OBJS= \
     49$(OBJDIR)\sdf.obj
    4550
    4651
    4752#
    48 # Include the .depend file.
    49 #   If the depend file don't exists we'll complain about it.
     53# Libraries. One space before the '\'.
    5054#
    51 !ifndef NODEP
    52 !   if [$(EXISTS) .depend] == 0
    53 !       include .depend
    54 !   else
    55 !       if [$(ECHO) .depend doesn't exist]
    56 !       endif
    57 !   endif
    58 !endif
     55LIBS = \
     56$(COMMONLIB) \
     57$(RTLLIB) \
     58os2386.lib
    5959
     60
     61#
     62# Target name - name of the exe without extention and path.
     63#
     64TARGET = sdf
     65
     66
     67#
     68# Includes the common rules.
     69#
     70!include $(PDWIN32_INCLUDE)\pdwin32.post
     71!include $(PDWIN32_TCOMMON)\common.mk.post
     72
  • TabularUnified trunk/tools/common/common.mk

    r3536 r4620  
    1 # $Id: common.mk,v 1.1 2000-05-13 17:17:08 bird Exp $
     1# $Id: common.mk,v 1.2 2000-11-19 08:29:54 bird Exp $
    22#
    33# Common definitions for tools.
     
    3232
    3333
     34#
     35# Add PDWIN32_TCOMMON to the C and C++ includes.
     36#
     37CINCLUDES = -I$(PDWIN32_TCOMMON) $(CINCLUDE)
     38
  • TabularUnified trunk/tools/common/makefile

    r4402 r4620  
    1 # $Id: makefile,v 1.7 2000-10-03 05:42:39 bird Exp $
     1# $Id: makefile,v 1.8 2000-11-19 08:29:54 bird Exp $
    22
    33#
     
    2121
    2222
    23 all:    commonicc.lib commongcc.a commongcc.lib
     23all:    commonicc.lib commongcc.a commongcc.lib \
     24        $(PDWIN32_TOOLS)\kDef2Wat.exe
     25#        $(PDWIN32_TOOLS)\kDump.exe
    2426
    2527
     
    6567        *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h *.c *.cpp -objo *.c *.cpp -objgobj *.c *.cpp
    6668
     69#
     70# Do not includes the common rules.
     71#
     72
  • TabularUnified trunk/tools/common/makefile.gcc

    r3592 r4620  
    1 # $Id: makefile.gcc,v 1.6 2000-05-23 18:23:04 bird Exp $
     1# $Id: makefile.gcc,v 1.7 2000-11-19 08:29:54 bird Exp $
    22
    33#
     
    3030LOCALCLEAN  = 1
    3131CLEANEXTRAS = commongcc.*
     32OLD_STYLE = 1
    3233
    3334
  • TabularUnified trunk/tools/common/makefile.icc

    r4426 r4620  
    1 # $Id: makefile.icc,v 1.13 2000-10-05 07:27:57 bird Exp $
     1# $Id: makefile.icc,v 1.14 2000-11-19 08:29:54 bird Exp $
    22
    33#
     
    1717LOCALCLEAN  = 1
    1818CLEANEXTRAS = commonicc.lib
     19OLD_STYLE = 1
    1920
    2021
  • TabularUnified trunk/tools/fastdep/makefile

    r3132 r4620  
    1 # $Id: makefile,v 1.5 2000-03-16 23:51:26 bird Exp $
     1# $Id: makefile,v 1.6 2000-11-19 08:27:21 bird Exp $
    22
    33#
     
    99
    1010
     11#
     12# Tell buildenvironment that we're makeing an .exe.
     13# Tell buildenvironment that we should not copy this into /bin.
     14#
     15EXETARGET = 1
     16NO_MAIN_BIN_COPY = 1
     17
     18
     19#
    1120# include common definitions
     21#
    1222PDWIN32_INCLUDE = ..\..\include
     23PDWIN32_TOOLS   = ..\bin
     24PDWIN32_BIN     = ..\bin
     25PDWIN32_LIB     = ..\..\lib
    1326!include $(PDWIN32_INCLUDE)\pdwin32.mk
    1427
     28
     29#
    1530# Addjust common definitions
     31#
     32!if "$(VAC3)" == "1" || "$(VAC36)" == "1"
     33CFLAGS   = $(CFLAGS) -W3 -Wall+ppt-ppc-inl-cnv-gnr-vft-gen-uni-ext- \
    1634!ifdef DEBUG
    17 CFLAGS   = $(CFLAGS)  -Ge+ -Tx+ -I..\common \
    18            -W3 -Wall+ppt-ppc-inl-cnv-gnr-vft-gen-uni-ext- -O+ -Tm-
    19 #          -W3 -Wall+ppt-ppc-inl-cnv-gnr-vft-gen-uni-ext- -Gh+ -Tm- #-O+
    20 LDFLAGS  = $(LDFLAGS) -Ge+ -Fe$@ /B"/MAP:full"
    21 !else
    22 CFLAGS   = $(CFLAGS)  -Ge+ -Tx+ -I..\common      \
    23            -W3 -Wall+ppt-ppc-inl-cnv-gnr-vft-gen-uni-ext-
    24 LDFLAGS  = $(LDFLAGS) -Ge+ -Fe$@ /B"/MAP:full"
     35        -O+ -Tm-
     36!endif
    2537!endif
    2638
    2739
    28 
    29 all: fastdep.exe ..\bin\fastdep.exe
     40#
     41# Object files. Prefix with OBJDIR and one space before the '\'.
     42#
     43OBJS = \
     44$(OBJDIR)\fastdep.obj \
     45$(OBJDIR)\avl.obj
    3046
    3147
    32 fastdep.exe: fastdep.obj avl.obj
    33     $(LD) $(LDFLAGS) $** $(RTLLIB) os2386.lib
    34 #   $(LD) $(LDFLAGS) $** CPPOPA3.OBJ $(RTLLIB) _DOSCALL.LIB os2386.lib
    35 
    36 ..\bin\fastdep.exe: fastdep.exe
    37    $(CP) $** $@
     48#
     49# Libraries. One space before the '\'.
     50#
     51LIBS = \
     52$(RTLLIB) \
     53os2386.lib
    3854
    3955
    40 dep: # dummy rule
     56#
     57# Target name - name of the exe without extention and path.
     58#
     59TARGET = FastDep
    4160
    4261
    43 clean:
    44    -@$(RM) *.obj *.exe *.map *.pch *.log ..\bin\fastdep.exe
     62#
     63# Includes the common rules.
     64#
     65!include $(PDWIN32_INCLUDE)/pdwin32.post
     66
     67
     68#
     69# We need all.
     70#
     71needed: all
     72
  • TabularUnified trunk/tools/impdef/makefile

    r4427 r4620  
    1 # $Id: makefile,v 1.5 2000-10-05 07:28:39 bird Exp $
     1# $Id: makefile,v 1.6 2000-11-19 08:26:52 bird Exp $
    22
    33#
     
    99
    1010
     11#
    1112# Directory macros.
     13#
    1214PDWIN32_INCLUDE = ..\..\include
    13 PDWIN32_BIN     = ..\..\bin\$(OBJDIR)
    1415PDWIN32_LIB     = ..\..\lib
     16PDWIN32_BIN     = ..\bin
    1517PDWIN32_TOOLS   = ..\bin
    1618PDWIN32_TCOMMON = ..\common
    1719
    1820
    19 # Defines for the pdwin32.post and pdwin32.mk
    20 LOCALCLEAN  = 1
    21 CLEANEXTRAS = $(PDWIN32_TOOLS)\impdef.exe *.log
    22 EXETARGET   = 1
     21#
     22# Tell buildenvironment that we're makeing an .exe.
     23# Tell buildenvironment that we should not copy this into /bin.
     24#
     25EXETARGET = 1
     26NO_MAIN_BIN_COPY = 1
    2327
    2428
     29#
    2530# Compiler, tools, and interference rules.
     31#
    2632!include $(PDWIN32_INCLUDE)\pdwin32.mk
    2733!include $(PDWIN32_TCOMMON)\common.mk
    2834
    2935
    30 
    31 # Flag overloads and local macros.
    32 CINCLUDES= -I$(PDWIN32_TCOMMON) -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\Win
    33 CFLAGS   = $(CFLAGS)   $(CINCLUDES) -Wall+ppt-ppc-inl-cnv-gnr-vft-
    34 CXXFLAGS = $(CXXFLAGS) $(CINCLUDES) -Wall+ppt-ppc-inl-cnv-gnr-vft- -Gx-
     36#
     37# Flag overrides.
     38#
     39!if "$(VAC3)" == "1" || "$(VAC36)" == "1"
     40CFLAGS   = $(CFLAGS)   -Wall+ppt-ppc-inl-cnv-gnr-vft-
     41CXXFLAGS = $(CXXFLAGS) -Wall+ppt-ppc-inl-cnv-gnr-vft- -Gx-
     42!endif
    3543
    3644
    37 # Object files. All objects should be prefixed with $(OBJDIR)!
     45#
     46# Object files. Prefix with OBJDIR and one space before the '\'.
     47#
    3848OBJS= \
    3949$(OBJDIR)\ImpDef.obj
    4050
    4151
    42 # All rule - build objs, target dll, copies dll to bin and makes libs.
    43 all:    $(OBJDIR) \
    44         $(PDWIN32_TOOLS)\ImpDef.exe
     52#
     53# Libraries. One space before the '\'.
     54#
     55LIBS = \
     56$(COMMONLIB) \
     57$(RTLLIB) \
     58os2386.lib
    4559
    4660
    47 $(OBJDIR)\ImpDef.exe: $(OBJS) $(COMMONLIB)
    48    $(LD) $(LDFLAGS) -Fe$@ $** $(RTLLIB) os2386.lib
    49 
    50 $(PDWIN32_TOOLS)\ImpDef.exe: $(OBJDIR)\ImpDef.exe
    51    $(CP) $** $@
     61#
     62# Target name - name of the exe without extention and path.
     63#
     64TARGET = ImpDef
    5265
    5366
    54 # Dep rule - makes depenencies for C, C++ and Asm files.
    55 dep:
    56     $(DEPEND) $(CINCLUDES) *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
    57         *.c *.cpp
    58 
    59 
    60 # Include common rules
     67#
     68# Includes the common rules.
     69#
    6170!include $(PDWIN32_INCLUDE)\pdwin32.post
    6271!include $(PDWIN32_TCOMMON)\common.mk.post
     72
  • TabularUnified trunk/tools/install/makefile

    r3880 r4620  
     1# $Id: makefile,v 1.3 2000-11-19 08:26:36 bird Exp $
     2
    13#
    24# PD-Win32 API
    35#
     6#       odininst.exe makefile
    47#
    58
    6 # Tell that we're producing an executable
     9
     10#
     11# Tell that we're producing an executable.
     12#
    713EXETARGET = 1
    814
    9 PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\$(OBJDIR)
    12 PDWIN32_TOOLS   = ..\bin
    1315
    14 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     16#
     17# Compiler, tools, and interference rules.
     18#
     19!include ../../include/pdwin32.mk
    1520
     21
     22#
     23# Overrides
     24#
     25LD2FLAGS = $(LD2FLAGS_ODINCRT) /PMTYPE:pm /STACK:0x100000 /NOBASE
     26
     27
     28#
     29# Object files. Prefix with OBJDIR and one space before the '\'.
     30#
     31OBJS = \
     32$(OBJDIR)\odininst.obj
     33
     34
     35#
     36# Libraries. One space before the '\'.
     37#
     38LIBS = \
     39os2386.lib \
     40$(PDWIN32_LIB)\kernel32.lib
     41
     42
     43#
     44# Target name - name of the exe without extention and path.
     45#
    1646TARGET = odininst
    1747
    18 all:    $(OBJDIR) \
    19         $(OBJDIR)\$(TARGET).exe \
    20         $(PDWIN32_BIN)\$(TARGET).exe
    2148
    22 # Flag overloads and local macros.
    23 CLEANEXTRAS = $(PDWIN32_BIN)\$(TARGET).exe
     49#
     50# Includes the common rules.
     51#
     52!include $(PDWIN32_INCLUDE)\pdwin32.post
    2453
    25 # Object files. All objects should be prefixed with $(OBJDIR)!
    26 OBJS = $(OBJDIR)\odininst.obj
    27 
    28 
    29 # Lib rule - dummy rule.
    30 lib:
    31 
    32 
    33 # Exe rule - builds the target exe.
    34 $(OBJDIR)\$(TARGET).exe: $(OBJS) $(OBJDIR)\$(TARGET).lrf
    35     $(LD2) $(LD2FLAGS_ODINCRT) @$(OBJDIR)\$(TARGET).lrf
    36 
    37 # Linker file - creates the parameter file passed on to the linker.
    38 $(OBJDIR)\$(TARGET).lrf: makefile
    39     @echo Creating file <<$@
    40 /OUT:$(OBJDIR)\$(TARGET).exe
    41 /MAP:$(OBJDIR)\$(TARGET).map
    42 /PMTYPE:pm
    43 /STACK:0x100000
    44 /NOBASE
    45 $(OBJS)
    46 os2386.lib
    47 $(PDWIN32_LIB)\kernel32.lib
    48 <<keep
    49 
    50 
    51 # Dep rule - makes depenencies for C, C++ and Asm files.
    52 dep:
    53     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    54         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    55 
    56 
    57 # Includes the common rules.
    58 !include $(PDWIN32_INCLUDE)/pdwin32.post
  • TabularUnified trunk/tools/makefile

    r4332 r4620  
    1 # $Id: makefile,v 1.12 2000-09-28 03:06:26 bird Exp $
     1# $Id: makefile,v 1.13 2000-11-19 08:20:55 bird Exp $
    22
    33#
     
    1616#
    1717#
     18
     19
     20#
     21# Directory macros.
     22#
    1823PDWIN32_INCLUDE = ..\include
     24PDWIN32_TOOLS   = .\bin
    1925!include $(PDWIN32_INCLUDE)\pdwin32.tools
    2026
    21 !ifdef DEBUG
    22 MAKE_CMD = $(MAKE) -nologo DEBUG=1
    23 !else
    24 MAKE_CMD = $(MAKE) -nologo
    25 !endif
     27
     28#
     29# The directories included in the usual makes; all, clean, dep rules.
     30#
     31ALL_DIRS = \
     32.\common \
     33.\database \
     34.\impdef \
     35.\fastdep \
     36.\wrc \
     37.\omfdumper \
     38.\sdf \
     39.\install
    2640
    2741
    28 all:
    29     cd common
    30     $(MAKE_CMD)
    31     cd ..\database
    32     $(MAKE_CMD)
    33     cd ..\impdef
    34     $(MAKE_CMD)
    35     cd ..\fastdep
    36     $(MAKE_CMD)
    37     cd ..\wrc
    38     $(MAKE_CMD) -f makefile.os2
    39     cd ..\omfdumper
    40     $(MAKE_CMD)
    41     cd ..\sdf
    42     $(MAKE_CMD)
    43     cd ..\install
    44     $(MAKE_CMD)
    45     cd ..
     42#
     43# Dummy all rule.
     44#
     45_all: all
    4646
     47
     48#
     49# common rules.
     50#
     51dep clean all:
     52    $(DODIRS) "$(ALL_DIRS)" $(MAKE_CMD) $@
     53
     54
     55#
    4756# compile tools needed to compile rest of the tree.
     57#
    4858needed:
    4959    cd fastdep
     
    5868
    5969
    60 dep:
    61     cd common
    62     $(MAKE_CMD) NODEP=1 dep
    63     cd ..\database
    64     $(MAKE_CMD) NODEP=1 dep
    65     cd ..\impdef
    66     $(MAKE_CMD) NODEP=1 dep
    67     cd ..\wrc
    68     $(MAKE_CMD) -f makefile.os2 NODEP=1 dep
    69     cd ..\omfdumper
    70     $(MAKE_CMD) NODEP=1 dep
    71     cd ..\sdf
    72     $(MAKE_CMD) NODEP=1 dep
    73     cd ..
     70#
     71# Do not includes the common rules.
     72#
    7473
    75 
    76 clean:
    77     cd common
    78     $(MAKE_CMD) NODEP=1 clean
    79     cd ..\database
    80     $(MAKE_CMD) NODEP=1 clean
    81     cd ..\impdef
    82     $(MAKE_CMD) NODEP=1 clean
    83     cd ..\fastdep
    84     $(MAKE_CMD) NODEP=1 clean
    85     cd ..\wrc
    86     $(MAKE_CMD) -f makefile.os2 NODEP=1 clean
    87     cd ..\omfdumper
    88     $(MAKE_CMD) NODEP=1 clean
    89     cd ..\sdf
    90     $(MAKE_CMD) NODEP=1 clean
    91     cd ..
    92 
  • TabularUnified trunk/tools/omfdumper/makefile

    r2714 r4620  
    1 # $Id: makefile,v 1.2 2000-02-09 23:49:55 bird Exp $
     1# $Id: makefile,v 1.3 2000-11-19 08:26:16 bird Exp $
    22
    33#
     
    77#
    88
    9 !include ..\..\include\pdwin32.tools
     9#
     10# Directory macros.
     11#
     12PDWIN32_INCLUDE = ..\..\include
     13PDWIN32_LIB     = ..\..\lib
     14PDWIN32_BIN     = ..\bin
     15PDWIN32_TOOLS   = ..\bin
     16PDWIN32_TCOMMON = ..\common
    1017
    11 all: omfdumper.exe ..\bin\omfdumper.exe
    1218
    13 omfdumper.exe:  omfdumper.c omf.h
    14    icc /ti+ /Q+ omfdumper.c
     19#
     20# Tell buildenvironment that we're makeing an .exe.
     21# Tell buildenvironment that we should not copy this into /bin.
     22#
     23EXETARGET = 1
     24NO_MAIN_BIN_COPY = 1
    1525
    16 ..\bin\omfdumper.exe: omfdumper.exe
    17    $(CP) $** $@
    1826
    19 dep: # dummy rule
     27#
     28# Compiler, tools, and interference rules.
     29#
     30!include $(PDWIN32_INCLUDE)\pdwin32.mk
     31!include $(PDWIN32_TCOMMON)\common.mk
    2032
    21 clean:
    22    -@$(RM) *.obj
    23    -@$(RM) *.exe
    2433
     34#
     35# Object files. Prefix with OBJDIR and one space before the '\'.
     36#
     37OBJS= \
     38$(OBJDIR)\omfdumper.obj
     39
     40
     41#
     42# Libraries. One space before the '\'.
     43#
     44LIBS = \
     45$(RTLLIB) \
     46os2386.lib
     47
     48
     49#
     50# Target name - name of the exe without extention and path.
     51#
     52TARGET = omfdumper
     53
     54
     55#
     56# Includes the common rules.
     57#
     58!include $(PDWIN32_INCLUDE)\pdwin32.post
     59!include $(PDWIN32_TCOMMON)\common.mk.post
     60
Note: See TracChangeset for help on using the changeset viewer.