Changeset 19113


Ignore:
Timestamp:
2010-01-13T06:21:50+01:00 (8 years ago)
Author:
lars
Message:

Fix libuuid header location and reenable building of mkfs.ubifs

Location:
trunk/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/libuuid/Makefile

    r19105 r19113  
    3737 
    3838define Host/Install 
    39         $(INSTALL_DIR) $(STAGING_DIR_HOST)/{lib,include} 
    40         $(CP) $(HOST_BUILD_DIR)/lib/uuid/uuid.h $(STAGING_DIR_HOST)/include/ 
     39        $(INSTALL_DIR) $(STAGING_DIR_HOST)/{lib,include/uuid} 
     40        $(CP) $(HOST_BUILD_DIR)/lib/uuid/uuid.h $(STAGING_DIR_HOST)/include/uuid/ 
    4141        $(CP) $(HOST_BUILD_DIR)/lib/uuid/libuuid.{so*,a} $(STAGING_DIR_HOST)/lib/ 
    4242endef 
    4343 
    4444define Host/Clean 
    45         rm -f $(STAGING_DIR_HOST)/include/uuid.h 
     45        rm -f $(STAGING_DIR_HOST)/include/uuid/uuid.h 
    4646        rm -f $(STAGING_DIR_HOST)/lib/uuid/libuuid.{so*,a} 
    4747        $(call Host/Clean/Default) 
  • trunk/tools/mtd-utils/Makefile

    r19106 r19113  
    2222include $(INCLUDE_DIR)/host-build.mk 
    2323 
    24 CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) 
     24CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) -L$(STAGING_DIR_HOST)/lib 
    2525ifneq ($(HOST_OS),Linux) 
    2626CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h 
     
    4040                $(MTD_MAKEOPTS) \ 
    4141                TARGETS=ubinize 
     42        $(MAKE) -C $(HOST_BUILD_DIR)/mkfs.ubifs \ 
     43                $(MTD_MAKEOPTS) \ 
     44                BUILDDIR="$(HOST_BUILD_DIR)/mkfs.ubifs" 
    4245endef 
    4346 
     
    4548        $(CP) \ 
    4649                $(HOST_BUILD_DIR)/mkfs.jffs2 \ 
     50                $(HOST_BUILD_DIR)/mkfs.ubifs/mkfs.ubifs \ 
    4751                $(HOST_BUILD_DIR)/ubinize \ 
    4852                $(STAGING_DIR_HOST)/bin/ 
     
    5054 
    5155define Host/Clean 
    52         rm -f $(STAGING_DIR_HOST)/bin/{mkfs.jffs2,ubinize} 
     56        rm -f $(STAGING_DIR_HOST)/bin/{mkfs.jffs2,mkfs.ubifs,ubinize} 
    5357endef 
    5458 
Note: See TracChangeset for help on using the changeset viewer.