Changeset 3581 for trunk


Ignore:
Timestamp:
Sep 3, 2007, 12:02:55 AM (18 years ago)
Author:
bird
Message:

converted to a sub-makefile setup for the whole kStuff tree.

Location:
trunk/kStuff
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/kStuff/kDbg/Makefile.kmk

    r3552 r3581  
    11# $Id$
    22## @file
    3 # kDbg - The Debug Info Reader.
     3# kDbg - The Debug Info Reader, sub-makefile.
    44#
    55
    … …  
    2525#
    2626
    27 DEPTH = ../..
    28 include $(PATH_KBUILD)/header.kmk
     27DEPTH ?= ../..
     28SUB_DEPTH = ..
     29include $(PATH_KBUILD)/subheader.kmk
    2930
    3031#
    … …  
    3435kDbg_TEMPLATE = kStuffDLL
    3536kDbg_DEFS = KDBG_BUILDING KDBG_RESIDES_IN_DLL
    36 kDbg_INCS = ../kLdr
    3737kDbg_SOURCES := \
    3838        kDbgModule.cpp \
    … …  
    4343        kDbgModWinDbgHelp.cpp
    4444
    45 
    4645#
    4746# kDbgStatic - The profiler module.
    … …  
    5049kDbgStatic_TEMPLATE = kStuffLIB
    5150kDbgStatic_DEFS = KDBG_BUILDING
    52 kDbgStatic_INCS = ../kLdr
    5351kDbgStatic_SOURCES = $(kDbg_SOURCES)
    5452
    … …  
    6664
    6765# Generate the rules
    68 include $(PATH_KBUILD)/footer.kmk
     66include $(PATH_KBUILD)/subfooter.kmk
    6967

  • trunk/kStuff/kErr/Makefile.kmk

    r3579 r3581  
    11# $Id$
    22## @file
    3 # kErr - The Status Code API.
     3# kErr - The Status Code API, sub-makefile.
    44#
    55
    … …  
    2525#
    2626
    27 DEPTH = ../..
    28 include $(PATH_KBUILD)/header.kmk
     27DEPTH ?= ../..
     28SUB_DEPTH ?= ..
     29include $(PATH_KBUILD)/subheader.kmk
    2930
    3031#
    … …  
    4243# Generate case statements for kErrName().
    4344#
    44 $(PATH_TARGET)/kErrNameConsts.h: ../include/k/kErrors.h $(MAKEFILE_CURRENT) | $(call DIRDEP,$(PATH_TARGET))
     45$(PATH_TARGET)/kErrNameConsts.h: $(PATH_SUB_ROOT)/include/k/kErrors.h $(MAKEFILE_CURRENT) | $(call DIRDEP,$(PATH_TARGET))
    4546        $(RM) -f $@
    4647        $(SED) \
    … …  
    4950                -e '/K[A-Z_]*ERR_[A-Z0-9_]*BASE/d' \
    5051                -e '/K[A-Z_]*ERR_[A-Z0-9_]*END/d' \
    51                 ../include/k/kErrors.h > $@
     52                $< > $@
    5253
    5354
    5455# Generate the rules
    55 include $(PATH_KBUILD)/footer.kmk
     56include $(PATH_KBUILD)/subfooter.kmk
    5657

  • trunk/kStuff/kHlp/Makefile.kmk

    r3579 r3581  
    11# $Id$
    22## @file
    3 # kHlp - The Helper API.
     3# kHlp - The Helper API, sub-makefile.
    44#
    55
    … …  
    2525#
    2626
    27 DEPTH = ../..
    28 include $(PATH_KBUILD)/header.kmk
     27DEPTH ?= ../..
     28SUB_DEPTH = ..
     29include $(PATH_KBUILD)/subheader.kmk
    2930
    3031#
    … …  
    112113
    113114# Generate the rules
    114 include $(PATH_KBUILD)/footer.kmk
     115include $(PATH_KBUILD)/subfooter.kmk
    115116

  • trunk/kStuff/kLdr/Makefile.kmk

    • Property svn:eol-style set to native
    r3579 r3581  
    1 # $Id$# $Id$
     1# $Id$
    22## @file
    3 #
    4 # kBuild Makefile for the kLdr.
    5 #
    6 # Copyright (c) 2006 knut st. osmundsen <bird@anduin.net>
    7 #
    8 #
    9 # This file is part of kLdr.
    10 #
    11 # kLdr is free software; you can redistribute it and/or modify
    12 # it under the terms of the GNU General Public License as published by
    13 # the Free Software Foundation; either version 2 of the License, or
    14 # (at your option) any later version.
    15 #
    16 # kLdr is distributed in the hope that it will be useful,
     3# kLdr - The Dynamic Loader, sub-makefile.
     4#
     5
     6#
     7# Copyright (c) 2006-2007 knut st. osmundsen <bird-src-spam@anduin.net>
     8#
     9# This file is part of kStuff.
     10#
     11# kStuff is free software; you can redistribute it and/or
     12# modify it under the terms of the GNU Lesser General Public
     13# License as published by the Free Software Foundation; either
     14# version 2.1 of the License, or (at your option) any later version.
     15#
     16# kStuff is distributed in the hope that it will be useful,
    1717# but WITHOUT ANY WARRANTY; without even the implied warranty of
    18 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    19 # GNU General Public License for more details.
    20 #
    21 # You should have received a copy of the GNU General Public License
    22 # along with kLdr; if not, write to the Free Software
    23 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    24 #
    25 #
    26 
    27 
    28 DEPTH = ../..
    29 include $(PATH_KBUILD)/header.kmk
     18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     19# Lesser General Public License for more details.
     20#
     21# You should have received a copy of the GNU Lesser General Public
     22# License along with kStuff; if not, write to the Free Software
     23# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
     24#
     25#
     26
     27DEPTH ?= ../..
     28SUB_DEPTH = ..
     29include $(PATH_KBUILD)/subheader.kmk
    3030
    3131#
    … …  
    6666 TEMPLATE_TST_LDFLAGS =
    6767endif
    68 TEMPLATE_TST_INCS = . ../include
     68TEMPLATE_TST_INCS := $(PATH_SUB_CURRENT) $(PATH_SUB_ROOT)/include
    6969
    7070
    … …  
    7272# The kLdr DLL.
    7373#
    74 DLLS = kLdr
     74DLLS += kLdr
    7575kLdr_ASTOOL = NASM
    7676ifeq ($(BUILD_TARGET),win)
    … …  
    112112 kLdr_LDFLAGS = -nostdlib
    113113endif
    114 kLdr_INCS = . ../include
     114kLdr_INCS := $(PATH_SUB_CURRENT) $(PATH_SUB_ROOT)/include
    115115kLdr_SOURCES = \
    116116        kLdr.c \
    … …  
    144144kLdrStatic_TEMPLATE = kStuffLIB
    145145kLdrStatic_SDKS.win = WINPSDK W2K3DDK
    146 kLdrStatic_INCS = . ../include
     146kLdrStatic_INCS := $(PATH_SUB_CURRENT) $(PATH_SUB_ROOT)/include
    147147kLdrStatic_DEFS.win = __WIN__
    148148kLdrStatic_DEFS.os2 = __OS2__
    … …  
    171171kLdrExeStub-win_SDKS.x86 = WIN32SDK
    172172kLdrExeStub-win_SDKS.amd64 = WIN64SDK
    173 kLdrExeStub-win_INCS = . ../include
     173kLdrExeStub-win_INCS := $(PATH_SUB_CURRENT) $(PATH_SUB_ROOT)/include
    174174kLdrExeStub-win_DEFS = __WIN__
    175175kLdrExeStub-win_CFLAGS = -W3 -Zl
    … …  
    214214
    215215
    216 
    217216# Generate rules.
    218 include $(PATH_KBUILD)/footer.kmk
    219 
    220 
    221 
     217include $(PATH_KBUILD)/subfooter.kmk
     218

  • trunk/kStuff/kProfiler2/Makefile.kmk

    • Property svn:eol-style set to native
    • Property svn:keywords set to Id
    r3566 r3581  
    1 # $Id: $
     1# $Id$
    22## @file
    3 # kProfiler Mark 2
     3# kProfiler Mark 2, sub-makefile.
    44#
    55
    … …  
    2525
    2626
    27 DEPTH = ../..
    28 include $(PATH_KBUILD)/header.kmk
     27DEPTH ?= ../..
     28SUB_DEPTH = ..
     29include $(PATH_KBUILD)/subheader.kmk
    2930
    30 #LIBRARIES   = kPrf2GC kPrf2R0
    31 DLLS        = kPrf2
    32 PROGRAMS    = kPrf2Read
     31#LIBRARIES  += kPrf2GC kPrf2R0
     32DLLS       += kPrf2
     33PROGRAMS   += kPrf2Read
    3334
    3435
    … …  
    110111        KPRF_LEAVE=_KPrfLeave
    111112
    112 
    113 
    114113#
    115114# kPrf2Read - The read & producer of statistics.
    … …  
    123122        $(PATH_LIB)/kRdrStatic$(SUFF_LIB) \
    124123        $(PATH_LIB)/kHlpCRTStatic$(SUFF_LIB)
    125 
    126 # kLdr stuff
    127 KLDR_ROOT ?= $(PATH_CURRENT)/../kLdr
    128 kPrf2Read_INCS += $(KLDR_ROOT)
    129124
    130125
    … …  
    146141
    147142# Generate the rules
    148 include $(PATH_KBUILD)/footer.kmk
     143include $(PATH_KBUILD)/subfooter.kmk
    149144
    150145

  • trunk/kStuff/kRdr/Makefile.kmk

    r3571 r3581  
    11# $Id$
    22## @file
    3 # kRdr - The File Provider.
     3# kRdr - The File Provider, sub-makefile.
    44#
    55
    … …  
    2525#
    2626
    27 DEPTH = ../..
    28 include $(PATH_KBUILD)/header.kmk
     27DEPTH ?= ../..
     28SUB_DEPTH = ..
     29include $(PATH_KBUILD)/subheader.kmk
    2930
    3031#
    … …  
    4041
    4142# Generate the rules
    42 include $(PATH_KBUILD)/footer.kmk
     43include $(PATH_KBUILD)/subfooter.kmk
    4344
Note: See TracChangeset for help on using the changeset viewer.