Changes in uspace/Makefile.common [00d7e1b:e8c5c11] in mainline


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile.common

    r00d7e1b re8c5c11  
    4444#   EXTRA_CLEAN        additional cleanup targets
    4545#
    46 #   POSIX_COMPAT       set to 'y' to use POSIX compatibility layer
    47 #
    4846# Optionally, for a binary:
    4947#   STATIC_NEEDED      set to 'y' for init binaries, will build statically
     
    106104LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
    107105
    108 LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
    109 
    110106LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
    111107LIBFS_PREFIX = $(LIB_PREFIX)/fs
    112 LIBFB_PREFIX = $(LIB_PREFIX)/fb
    113108LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
    114 LIBFMTUTIL_PREFIX = $(LIB_PREFIX)/fmtutil
    115 
    116 LIBEXT2_PREFIX = $(LIB_PREFIX)/ext2
    117 
    118 LIBUSB_PREFIX = $(LIB_PREFIX)/usb
    119 LIBUSBHOST_PREFIX = $(LIB_PREFIX)/usbhost
    120 LIBUSBDEV_PREFIX = $(LIB_PREFIX)/usbdev
    121 LIBUSBHID_PREFIX = $(LIB_PREFIX)/usbhid
    122 LIBUSBVIRT_PREFIX = $(LIB_PREFIX)/usbvirt
    123109
    124110LIBDRV_PREFIX = $(LIB_PREFIX)/drv
     111LIBPACKET_PREFIX = $(LIB_PREFIX)/packet
    125112LIBNET_PREFIX = $(LIB_PREFIX)/net
    126 LIBNIC_PREFIX = $(LIB_PREFIX)/nic
    127 LIBMINIX_PREFIX = $(LIB_PREFIX)/minix
    128 
    129 LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi
    130113
    131114ifeq ($(STATIC_NEEDED),y)
     
    143126endif
    144127
    145 # Build static whenever we use libusb because that library uses
    146 # thread local variables
    147 ifneq ($(findstring usb, $(LIBS)),)
    148         STATIC_BUILD = y
    149 endif
    150 
    151128ifeq ($(STATIC_BUILD), y)
    152129BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
     
    220197JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
    221198
    222 ifeq ($(POSIX_COMPAT),y)
    223         CFLAGS = -I$(LIBPOSIX_PREFIX)
    224         LIBS += $(LIBPOSIX_PREFIX)/libposix.a
    225 endif
    226 
    227199ifeq ($(COMPILER),gcc_cross)
    228         CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
     200        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
    229201        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    230202endif
    231203
    232204ifeq ($(COMPILER),gcc_native)
    233         CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
     205        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
    234206        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    235207endif
    236208
    237209ifeq ($(COMPILER),icc)
    238         CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)
     210        CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
    239211        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    240212endif
    241213
    242214ifeq ($(COMPILER),clang)
    243         CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
     215        CFLAGS = $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
    244216        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    245217endif
Note: See TracChangeset for help on using the changeset viewer.