VirtualBox

Changeset 809 in kBuild for trunk/src/gmake/Makefile.kmk


Ignore:
Timestamp:
Jan 29, 2007 5:54:36 AM (18 years ago)
Author:
bird
Message:

Solaris + cleanup.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/gmake/Makefile.kmk

    r778 r809  
    55include $(PATH_KBUILD)/header.kmk
    66
     7
     8#
     9# Template for kmk and the kmk_* binaries in this makefile.
     10#
     11TEMPLATE_BIN-KMK = Template for src/gmake binaries
     12TEMPLATE_BIN-KMK_EXTENDS = BIN
     13TEMPLATE_BIN-KMK_DEFS = HAVE_CONFIG_H $(TEMPLATE_BIN_DEFS)
     14TEMPLATE_BIN-KMK_DEPS = $(PATH_TARGET)/config.h
     15TEMPLATE_BIN-KMK_DEPS.solaris = \
     16        $(PATH_TARGET)/fts.h \
     17        $(PATH_TARGET)/paths.h
     18TEMPLATE_BIN-KMK_DEPS.win     = \
     19        $(PATH_TARGET)/fts.h \
     20        $(PATH_TARGET)/sysexits.h \
     21        $(PATH_TARGET)/unistd.h \
     22        $(PATH_TARGET)/paths.h \
     23        $(PATH_TARGET)/grp.h \
     24        $(PATH_TARGET)/pwd.h \
     25        $(PATH_TARGET)/inttypes.h
     26TEMPLATE_BIN-KMK_INCS = $(PATH_TARGET) . $(TEMPLATE_BIN_INCS)
     27TEMPLATE_BIN-KMK_INCS.darwin = glob
     28TEMPLATE_BIN-KMK_INCS.freebsd = glob
     29TEMPLATE_BIN-KMK_INCS.solaris = glob
     30TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN_LIBS) $(TARGET_kmkmissing)
     31
     32
     33#
     34# A library containing the missing features needed by kmk and the
     35# kmk_* binaries. Saves a bit of work later on.
     36#
     37LIBRARIES += kmkmissing
     38kmkmissing_TEMPLATE = BIN-KMK
     39kmkmissing_NOINST = 1
     40kmkmissing_SOURCES = \
     41        kmkbuiltin/err.c \
     42        kmkbuiltin/setmode.c \
     43        kmkbuiltin/strmode.c \
     44        kmkbuiltin/strlcpy.c
     45
     46kmkmissing_SOURCES.darwin = \
     47        kmkbuiltin/darwin.c \
     48        glob/glob.c \
     49        glob/fnmatch.c
     50
     51kmkmissing_SOURCES.freebsd = \
     52        glob/glob.c \
     53        glob/fnmatch.c
     54
     55kmkmissing_SOURCES.solaris = \
     56        kmkbuiltin/solfakes.c \
     57        kmkbuiltin/fts.c \
     58        glob/glob.c \
     59        glob/fnmatch.c \
     60        getopt.c \
     61        getopt1.c
     62
     63kmkmissing_SOURCES.win += \
     64        glob/glob.c \
     65        glob/fnmatch.c \
     66        getopt.c \
     67        getopt1.c \
     68        getloadavg.c \
     69        w32/subproc/misc.c \
     70        w32/subproc/sub_proc.c \
     71        w32/subproc/w32err.c \
     72        w32/compat/dirent.c \
     73        w32/pathstuff.c \
     74        kmkbuiltin/mscfakes.c \
     75        kmkbuiltin/fts.c
     76
    777#
    878# kmk
    … …  
    1080PROGRAMS += kmk
    1181
    12 kmk_TEMPLATE = BIN
    13 kmk_DEPS = $(PATH_TARGET)/config.h
    14 kmk_INCS = $(PATH_TARGET) .
    15 kmk_INCS.darwin = glob
    16 kmk_INCS.freebsd = glob
    17 #ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
    18 #kmk_INCS += kmkbuiltin/w32
    19 #endif
     82kmk_TEMPLATE = BIN-KMK
    2083
    2184kmk_DEFS = \
    22         HAVE_CONFIG_H \
    2385        NO_ARCHIVES \
     86        EXPERIMENTAL \
     87        CONFIG_WITH_TOUPPER_TOLOWER \
     88        \
     89        KMK \
     90        KMK_HELPERS \
     91        VARIABLE_HASH \
    2492        CONFIG_NO_DEFAULT_SUFFIXES \
    2593        CONFIG_NO_DEFAULT_PATTERN_RULES \
    … …  
    2997        CONFIG_WITH_EXTENDED_NOTPARALLEL \
    3098        CONFIG_WITH_INCLUDEDEP \
    31         CONFIG_WITH_TOUPPER_TOLOWER \
    32         CONFIG_WITH_ABSPATHEX \
    33         CONFIG_PRETTY_COMMAND_PRINTING \
    34         KMK \
    35         \
    36         KMK_HELPERS \
    37         VARIABLE_HASH \
    3899        CONFIG_WITH_OPTIMIZATION_HACKS \
    39100        CONFIG_WITH_VALUE_LENGTH \
     101        CONFIG_WITH_ABSPATHEX \
    40102        CONFIG_WITH_COMPARE \
    41103        CONFIG_WITH_STACK \
    42104        CONFIG_WITH_MATH \
    43         EXPERIMENTAL \
     105        CONFIG_PRETTY_COMMAND_PRINTING \
    44106        \
    45107        BUILD_PLATFORM=\"$(BUILD_TARGET)\" \
    46108        BUILD_PLATFORM_ARCH=\"$(BUILD_TARGET_ARCH)\" \
    47109        BUILD_PLATFORM_CPU=\"$(BUILD_TARGET_CPU)\"
    48 kmk_DEFS.win = CONFIG_NEW_WIN32_CTRL_EVENT
     110kmk_DEFS.win = \
     111        CONFIG_NEW_WIN32_CTRL_EVENT
    49112
    50113kmk_SOURCES = \
    … …  
    73136        kbuild.c
    74137
    75 ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
    76 kmk_SOURCES += \
    77         getopt.c \
    78         getopt1.c \
    79         getloadavg.c \
    80         w32/subproc/misc.c \
    81         w32/subproc/sub_proc.c \
    82         w32/subproc/w32err.c \
    83         glob/glob.c \
    84         glob/fnmatch.c \
    85         w32/compat/dirent.c \
    86         w32/pathstuff.c
    87 endif
    88 
    89 kmk_SOURCES.freebsd = \
    90         glob/glob.c \
    91         glob/fnmatch.c
    92 
    93 kmk_SOURCES.darwin = \
    94         glob/glob.c \
    95         glob/fnmatch.c
    96 
    97138#
    98139# kmkbuiltin commands
    … …  
    113154        kmkbuiltin/rm.c \
    114155        kmkbuiltin/rmdir.c \
    115         \
    116         kmkbuiltin/err.c \
    117         kmkbuiltin/setmode.c \
    118         kmkbuiltin/strmode.c \
    119         kmkbuiltin/strlcpy.c
    120 
    121 ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
    122 kmk_SOURCES += \
    123         kmkbuiltin/mscfakes.c \
    124         kmkbuiltin/fts.c
    125 endif
    126 
    127 kmk_SOURCES.darwin += \
    128         kmkbuiltin/darwin.c
    129156
    130157
    … …  
    132159# Standalone kmkbuiltin commands.
    133160#
     161## @todo should probably put all those
    134162PROGRAMS += kmk_append kmk_cat kmk_cp kmk_echo kmk_mkdir kmk_mv kmk_install kmk_ln kmk_printf kmk_rm kmk_rmdir
    135163
    136 kmk_append_TEMPLATE = BIN
     164kmk_append_TEMPLATE = BIN-KMK
    137165kmk_append_DEFS = kmk_builtin_append=main
    138166kmk_append_INCS = .
    139167kmk_append_SOURCES = \
    140         kmkbuiltin/append.c \
    141         kmkbuiltin/err.c
    142 
    143 kmk_cat_TEMPLATE = BIN
     168        kmkbuiltin/append.c
     169
     170kmk_cat_TEMPLATE = BIN-KMK
    144171kmk_cat_DEFS = kmk_builtin_cat=main
    145172kmk_cat_SOURCES = \
    146         kmkbuiltin/cat.c \
    147         kmkbuiltin/err.c
    148 ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
    149 kmk_cat_INCS += $(PATH_TARGET) .
    150 kmk_cat_DEFS += HAVE_CONFIG_H
    151 kmk_cat_SOURCES += \
    152         kmkbuiltin/mscfakes.c \
    153         getopt.c \
    154         getopt1.c
    155 endif
    156 
    157 kmk_cp_TEMPLATE = BIN
     173        kmkbuiltin/cat.c
     174
     175kmk_cp_TEMPLATE = BIN-KMK
    158176kmk_cp_DEFS = kmk_builtin_cp=main
    159177kmk_cp_SOURCES = \
    160178        kmkbuiltin/cp.c \
    161         kmkbuiltin/cp_utils.c \
    162         kmkbuiltin/strlcpy.c \
    163         kmkbuiltin/err.c
    164 ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
    165 kmk_cp_INCS += $(PATH_TARGET) .
    166 kmk_cp_DEFS += HAVE_CONFIG_H
    167 kmk_cp_SOURCES += \
    168         kmkbuiltin/mscfakes.c \
    169         kmkbuiltin/fts.c \
    170         w32/compat/dirent.c \
    171         getopt.c \
    172         getopt1.c
    173 endif
    174 kmk_cp_SOURCES.darwin = \
    175         kmkbuiltin/darwin.c
    176 
    177 kmk_echo_TEMPLATE = BIN
     179        kmkbuiltin/cp_utils.c
     180
     181kmk_echo_TEMPLATE = BIN-KMK
    178182kmk_echo_DEFS = kmk_builtin_echo=main
    179183kmk_echo_SOURCES = \
    180184        kmkbuiltin/echo.c
    181 ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
    182 kmk_echo_SOURCES += \
    183         kmkbuiltin/mscfakes.c \
    184         kmkbuiltin/err.c
    185 endif
    186 
    187 kmk_install_TEMPLATE = BIN
     185
     186kmk_install_TEMPLATE = BIN-KMK
    188187kmk_install_DEFS = kmk_builtin_install=main
    189188kmk_install_SOURCES = \
    190         kmkbuiltin/install.c \
    191         kmkbuiltin/err.c \
    192         kmkbuiltin/strmode.c \
    193         kmkbuiltin/setmode.c
    194 ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
    195 kmk_install_INCS += $(PATH_TARGET) .
    196 kmk_install_DEFS += HAVE_CONFIG_H
    197 kmk_install_SOURCES += \
    198         kmkbuiltin/mscfakes.c \
    199         getopt.c \
    200         getopt1.c
    201 endif
    202 
    203 kmk_ln_TEMPLATE = BIN
     189        kmkbuiltin/install.c
     190
     191kmk_ln_TEMPLATE = BIN-KMK
    204192kmk_ln_DEFS = kmk_builtin_ln=main
    205193kmk_ln_SOURCES = \
    206         kmkbuiltin/ln.c \
    207         kmkbuiltin/err.c
    208 ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
    209 kmk_ln_INCS += $(PATH_TARGET) .
    210 kmk_ln_DEFS += HAVE_CONFIG_H
    211 kmk_ln_SOURCES += \
    212         kmkbuiltin/mscfakes.c\
    213         getopt.c \
    214         getopt1.c
    215 endif
    216 
    217 kmk_mkdir_TEMPLATE = BIN
     194        kmkbuiltin/ln.c
     195
     196kmk_mkdir_TEMPLATE = BIN-KMK
    218197kmk_mkdir_DEFS = kmk_builtin_mkdir=main
    219198kmk_mkdir_SOURCES = \
    220         kmkbuiltin/mkdir.c \
    221         kmkbuiltin/err.c \
    222         kmkbuiltin/setmode.c
    223 ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
    224 kmk_mkdir_INCS += $(PATH_TARGET) .
    225 kmk_mkdir_DEFS += HAVE_CONFIG_H
    226 kmk_mkdir_SOURCES += \
    227         kmkbuiltin/mscfakes.c \
    228         getopt.c \
    229         getopt1.c
    230 endif
    231 
    232 kmk_mv_TEMPLATE = BIN
     199        kmkbuiltin/mkdir.c
     200
     201kmk_mv_TEMPLATE = BIN-KMK
    233202kmk_mv_DEFS = kmk_builtin_mv=main
    234203kmk_mv_SOURCES = \
    235         kmkbuiltin/mv.c \
    236         kmkbuiltin/err.c \
    237         kmkbuiltin/strmode.c
    238 ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
    239 kmk_mv_INCS += $(PATH_TARGET) .
    240 kmk_mv_DEFS += HAVE_CONFIG_H
    241 kmk_mv_SOURCES += \
    242         kmkbuiltin/mscfakes.c \
    243         getopt.c \
    244         getopt1.c
    245 endif
    246 
    247 kmk_printf_TEMPLATE = BIN
     204        kmkbuiltin/mv.c
     205
     206kmk_printf_TEMPLATE = BIN-KMK
    248207kmk_printf_DEFS = kmk_builtin_printf=main
    249208kmk_printf_SOURCES = \
    250         kmkbuiltin/printf.c \
    251         kmkbuiltin/err.c
    252 ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
    253 kmk_printf_INCS += $(PATH_TARGET) .
    254 kmk_printf_DEFS += HAVE_CONFIG_H
    255 kmk_printf_SOURCES += \
    256         kmkbuiltin/mscfakes.c \
    257         getopt.c \
    258         getopt1.c
    259 endif
    260 
    261 kmk_rm_TEMPLATE = BIN
     209        kmkbuiltin/printf.c
     210
     211kmk_rm_TEMPLATE = BIN-KMK
    262212kmk_rm_DEFS = kmk_builtin_rm=main
    263213kmk_rm_SOURCES = \
    264         kmkbuiltin/rm.c \
    265         kmkbuiltin/err.c \
    266         kmkbuiltin/strmode.c
    267 ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
    268 kmk_rm_INCS += $(PATH_TARGET) .
    269 kmk_rm_DEFS += HAVE_CONFIG_H
    270 kmk_rm_SOURCES += \
    271         kmkbuiltin/mscfakes.c\
    272         getopt.c \
    273         getopt1.c
    274 endif
    275 
    276 kmk_rmdir_TEMPLATE = BIN
     214        kmkbuiltin/rm.c
     215
     216kmk_rmdir_TEMPLATE = BIN-KMK
    277217kmk_rmdir_DEFS = kmk_builtin_rmdir=main
    278218kmk_rmdir_SOURCES = \
    279         kmkbuiltin/rmdir.c \
    280         kmkbuiltin/err.c \
    281         kmkbuiltin/setmode.c
    282 ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
    283 kmk_rmdir_INCS += $(PATH_TARGET) .
    284 kmk_rmdir_DEFS += HAVE_CONFIG_H
    285 kmk_rmdir_SOURCES += \
    286         kmkbuiltin/mscfakes.c \
    287         getopt.c \
    288         getopt1.c
    289 endif
    290 
     219        kmkbuiltin/rmdir.c
    291220
    292221
    … …  
    295224#
    296225PROGRAMS += kmk_gmake
    297 kmk_gmake_TEMPLATE = BIN
    298 kmk_gmake_DEPS = $(PATH_TARGET)/config.h
    299 kmk_gmake_INCS = $(PATH_TARGET) .
    300 kmk_gmake_INCS.darwin = glob
    301 kmk_gmake_INCS.freebsd = glob
    302 
    303 
     226
     227kmk_gmake_TEMPLATE = BIN-KMK
    304228kmk_gmake_DEFS = \
    305229        HAVE_CONFIG_H \
    … …  
    332256        remote-stub.c
    333257
    334 ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
    335 kmk_gmake_SOURCES += \
    336         getopt.c \
    337         getopt1.c \
    338         getloadavg.c \
    339         w32/subproc/misc.c \
    340         w32/subproc/sub_proc.c \
    341         w32/subproc/w32err.c \
    342         glob/glob.c \
    343         glob/fnmatch.c \
    344         w32/compat/dirent.c \
    345         w32/pathstuff.c
    346 endif
    347 
    348 kmk_gmake_SOURCES.freebsd = \
    349         glob/glob.c \
    350         glob/fnmatch.c
    351 
    352 kmk_gmake_SOURCES.darwin = \
    353         glob/glob.c \
    354         glob/fnmatch.c
    355 
    356 
    357258
    358259include $(PATH_KBUILD)/footer.kmk
    … …  
    364265config.h.$(BUILD_TARGET) := config.h.$(BUILD_TARGET)
    365266config.h.win   := config.h.W32
    366 config.h.win32 := config.h.W32
    367 config.h.win64 := config.h.W32
    368 config.h.nt    := config.h.W32
    369267
    370268$(PATH_TARGET)/config.h: $(config.h.$(BUILD_TARGET))
    371269        $(MKDIR) -p $(dir $@)
    372270        $(CP) $^ $@
     271
     272#
     273# Some missing headers.
     274#
     275$(PATH_TARGET)/fts.h: kmkbuiltin/ftsfake.h | $(call DIRDEP,$(PATH_TARGET))
     276        $(CP) $^ $@
     277
     278$(PATH_TARGET)/unistd.h: | $(call DIRDEP,$(PATH_TARGET))
     279        $(ECHO_EXT) > $@
     280
     281$(PATH_TARGET)/sysexits.h: | $(call DIRDEP,$(PATH_TARGET))
     282        $(ECHO_EXT) > $@
     283
     284$(PATH_TARGET)/inttypes.h: | $(call DIRDEP,$(PATH_TARGET))
     285        $(ECHO_EXT) > $@
     286
     287$(PATH_TARGET)/paths.h: | $(call DIRDEP,$(PATH_TARGET))
     288        $(ECHO_EXT) > $@
     289
     290$(PATH_TARGET)/pwd.h: | $(call DIRDEP,$(PATH_TARGET))
     291        $(ECHO_EXT) > $@
     292
     293$(PATH_TARGET)/grp.h: | $(call DIRDEP,$(PATH_TARGET))
     294        $(ECHO_EXT) > $@
    373295
    374296
    … …  
    430352
    431353test_all:       test_math test_stack test_shell
     354
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette