Changeset 4717 for trunk/src/wsock32


Ignore:
Timestamp:
Dec 3, 2000, 12:45:13 AM (25 years ago)
Author:
bird
Message:

New makefile style. (addjustments)

Location:
trunk/src/wsock32
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wsock32/makefile

    r4620 r4717  
    1 # $Id: makefile,v 1.28 2000-11-19 08:35:49 bird Exp $
     1# $Id: makefile,v 1.29 2000-12-02 23:43:27 bird Exp $
    22
    33#
    … …  
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
    … …  
    3939#
    4040LIBS = \
    41 $(PDWIN32_LIB)/kernel32.lib \
    42 $(PDWIN32_LIB)/user32.lib \
    43 $(PDWIN32_LIB)/$(ODINCRT).lib \
     41$(ODIN32_LIB)/kernel32.lib \
     42$(ODIN32_LIB)/user32.lib \
     43$(ODIN32_LIB)/$(ODINCRT).lib \
    4444so32dll.lib \
    4545tcp32dll.lib \
    … …  
    5757# Includes the common rules.
    5858#
    59 !include $(PDWIN32_INCLUDE)/pdwin32.post
     59!include $(ODIN32_POST_INC)
    6060

  • trunk/src/wsock32/new/makefile

    r3198 r4717  
    1 # $Id: makefile,v 1.9 2000-03-22 20:01:06 sandervl Exp $
     1# $Id: makefile,v 1.10 2000-12-02 23:43:27 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
    14 
    159
    1610# Compiler, tools, and interference rules.
    17 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     11OLD_STYLE=1
     12!include ../../../makefile.inc
    1813
    1914
    … …  
    4439all:    $(OBJDIR) \
    4540        $(OBJDIR)\$(TARGET).dll \
    46         $(PDWIN32_BIN)\$(TARGET).dll \
     41        $(ODIN32_BIN)\$(TARGET).dll \
    4742        lib
    4843
    4944
    5045# Lib rule - build importlibrary (and evt. other libs)
    51 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
     46lib: $(TARGET).lib $(ODIN32_LIB)\$(TARGET).lib
    5247
    5348
    … …  
    6560$(TARGET).def
    6661tcp32dll.lib so32dll.lib
    67 $(PDWIN32_LIB)\kernel32.lib
    68 $(PDWIN32_LIB)/user32.lib
    69 $(PDWIN32_LIB)/odincrt.lib
     62$(ODIN32_LIB)\kernel32.lib
     63$(ODIN32_LIB)/user32.lib
     64$(ODIN32_LIB)/odincrt.lib
    7065OS2386.LIB
    7166$(RTLLIB_O)
    … …  
    7570# Dep rule - makes depenencies for C, C++ and Asm files.
    7671dep:
    77     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    78         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     72    $(DEPEND) -I$(ODIN32_INCLUDE);$(ODIN32_INCLUDE)\win \
     73        *.c *.cpp *.h *.asm *.inc $(ODIN32_INCLUDE)\*.h
    7974
    8075
    8176# Includes the common rules.
    82 !include $(PDWIN32_INCLUDE)/pdwin32.post
     77!include $(ODIN32_POST_INC)
    8378

  • trunk/src/wsock32/old/makefile

    r2014 r4717  
    1 # $Id: makefile,v 1.2 1999-12-07 20:29:15 achimha Exp $
     1# $Id: makefile,v 1.3 2000-12-02 23:43:28 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 #       wsock32.dll makefile
     6#       wsock32.dll makefile
    77#
    88
    9 PDWIN32_INCLUDE = ..\..\..\include
    10 PDWIN32_LIB = ..\..\..\lib
    11 PDWIN32_BIN = ..\..\..\bin
    12 PDWIN32_TOOLS = ..\..\..\tools\bin
    13 
    14 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     9OLD_STYLE=1
     10!include ../../../makefile.inc
    1511
    1612
    17 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    18 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     13CFLAGS = $(CFLAGS) -I$(ODIN32_INCLUDE)
     14CXXFLAGS = $(CXXFLAGS) -I$(ODIN32_INCLUDE)
    1915
    2016
    … …  
    2723
    2824$(TARGET).dll: $(OBJS) $(TARGET).def
    29         $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    30               $(PDWIN32_LIB)\pmwinx.lib $(PDWIN32_LIB)\user32.lib \
    31               tcp32dll.lib so32dll.lib  $(PDWIN32_LIB)\kernel32.lib \
    32               $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33         $(CP) $@ $(PDWIN32_BIN)
     25    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
     26              $(ODIN32_LIB)\pmwinx.lib $(ODIN32_LIB)\user32.lib \
     27              tcp32dll.lib so32dll.lib  $(ODIN32_LIB)\kernel32.lib \
     28              $(ODIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
     29    $(CP) $@ $(ODIN32_BIN)
    3430
    3531$(TARGET).lib: $(TARGET)exp.def
    3632    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    37     $(CP) $@ $(PDWIN32_LIB)
     33    $(CP) $@ $(ODIN32_LIB)
    3834
    3935$(TARGET)exp.def: $(TARGET).def
    … …  
    4743
    4844clean:
    49         $(RM) *.obj *.lib *.dll *~ *.map *.pch
    50         $(RM) $(PDWIN32_BIN)\$(TARGET).dll
    51         $(RM) $(PDWIN32_LIB)\$(TARGET).lib
     45    $(RM) *.obj *.lib *.dll *~ *.map *.pch
     46    $(RM) $(ODIN32_BIN)\$(TARGET).dll
     47    $(RM) $(ODIN32_LIB)\$(TARGET).lib
    5248
Note: See TracChangeset for help on using the changeset viewer.