Changeset eff9f8c in mainline


Ignore:
Timestamp:
2016-05-15T08:21:20Z (9 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f6017ee
Parents:
362654a
git-author:
Vojtech Horky <vojtech.horky@…> (2016-05-15 08:21:20)
git-committer:
Jakub Jermar <jakub@…> (2016-05-15 08:21:20)
Message:

Fix build error during incremental build and after modifying libc

Location:
uspace
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r362654a reff9f8c  
    266266all: $(BUILDS) $(BUILDS_TESTS)
    267267
    268 $(BUILDS_TESTS): $(BUILDS)
     268$(BUILDS_TESTS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
    269269        $(MAKE) -C $(basename $@) all-test PRECHECK=$(PRECHECK)
    270270

  • uspace/Makefile.common

    r362654a reff9f8c  
    198198
    199199ifeq ($(STATIC_BUILD),y)
    200         BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
     200        BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBURCU_PREFIX)/liburcu.a $(LIBSOFTINT_PREFIX)/libsoftint.a
    201201        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
    202202        ifeq ($(MATH),y)
    … …  
    331331endif
    332332
     333
     334ifneq ($(MAKECMDGOALS),clean)
    333335-include $(DEPEND)
     336endif
    334337
    335338OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    … …  
    371374
    372375ifneq ($(LIBRARY),)
    373 %.a: $(OBJECTS)
     376$(LIBRARY).a: $(OBJECTS)
    374377        $(AR) rc $@ $(OBJECTS)
    375378endif
    376379
    377380ifneq ($(SLIBRARY),)
    378 %.la: $(LOBJECTS)
     381$(SLIBRARY).la: $(LOBJECTS)
    379382        $(AR) rc $@ $(LOBJECTS)
    380383endif

  • uspace/app/barber/Makefile

    r362654a reff9f8c  
    8585include $(USPACE_PREFIX)/Makefile.common
    8686
    87 images.c images.h: $(IMAGES)
    88         $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $^
     87image%.c image%.h: $(IMAGES)
     88        $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $(IMAGES)

  • uspace/lib/c/Makefile

    r362654a reff9f8c  
    4747LSONAME = libc.so.0
    4848
    49 LIBS = $(LIBURCU_PREFIX)/liburcu.a
    5049EXTRA_CFLAGS += -I$(LIBURCU_PREFIX)
    5150

  • uspace/lib/ext4/Makefile

    r362654a reff9f8c  
    3030LIBRARY = libext4
    3131EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCRYPTO_PREFIX)
    32 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBCRYPTO_PREFIX)/libcrypto.a
    3332
    3433SOURCES = \

  • uspace/lib/nic/Makefile

    r362654a reff9f8c  
    3030LIBRARY = libnic
    3131EXTRA_CFLAGS += -DLIBNIC_INTERNAL -Iinclude -I$(LIBDRV_PREFIX)/include
    32 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    3332
    3433SOURCES = \

  • uspace/lib/pcut/Makefile

    r362654a reff9f8c  
    66PCUT_TEST_PREFIX = test-libpcut-
    77
    8 EXTRA_OUTPUT = \
     8SELF_TESTS = \
    99        $(PCUT_TEST_PREFIX)abort$(PCUT_TEST_SUFFIX) \
    1010        $(PCUT_TEST_PREFIX)asserts$(PCUT_TEST_SUFFIX) \
    … …  
    2525        $(PCUT_TEST_PREFIX)xmlreport$(PCUT_TEST_SUFFIX)
    2626
     27EXTRA_CLEAN = $(SELF_TESTS)
     28
    2729include helenos.mak
    2830
    … …  
    3133include helenos.test.mak
    3234
     35all-test: $(SELF_TESTS)
     36
    3337test-libpcut-%: $(OUTPUT)
    3438        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)

  • uspace/lib/pcut/update-from-master.sh

    r362654a reff9f8c  
    5959PCUT_TEST_PREFIX = test-libpcut-
    6060
    61 EXTRA_OUTPUT = \
     61SELF_TESTS = \
    6262EOF_MAKEFILE_HEAD
    6363
    … …  
    6969cat >>Makefile <<'EOF_MAKEFILE_TAIL'
    7070
     71EXTRA_CLEAN = $(SELF_TESTS)
     72
    7173include helenos.mak
    7274
    … …  
    7577include helenos.test.mak
    7678
     79all-test: $(SELF_TESTS)
     80
    7781test-libpcut-%: $(OUTPUT)
    7882        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)

  • uspace/lib/urcu/Makefile

    r362654a reff9f8c  
    2929USPACE_PREFIX = ../..
    3030
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    3331EXTRA_CFLAGS = -I. -I$(LIBC_PREFIX)/include
    3432
Note: See TracChangeset for help on using the changeset viewer.