Changeset 86d0b4b3 in mainline


Ignore:
Timestamp:
2011-03-06T12:12:13Z (14 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
68ed0fb
Parents:
5a81c5b
Message:

Fix minix.h file position

Location:
uspace
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    r5a81c5b r86d0b4b3  
    9090LIBNET_PREFIX = $(LIB_PREFIX)/net
    9191
     92LIBMINIX_PREFIX = $(LIB_PREFIX)/minix
     93
    9294BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
    9395

  • uspace/app/mkminix/Makefile

    r5a81c5b r86d0b4b3  
    3030USPACE_PREFIX = ../..
    3131LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    32 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
     32EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBMINIX_PREFIX)
    3333BINARY = mkminix
    3434

  • uspace/app/mkminix/mkminix.c

    r5a81c5b r86d0b4b3  
    4848#include <getopt.h>
    4949#include <mem.h>
    50 #include <fs/minix.h>
     50#include <minix.h>
    5151
    5252#define NAME    "mkminix"

  • uspace/srv/fs/minixfs/Makefile

    r5a81c5b r86d0b4b3  
    3030USPACE_PREFIX = ../../..
    3131LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a
    32 EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX)
     32EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX) -I$(LIBMINIX_PREFIX)
    3333BINARY = mfs
    3434

  • uspace/srv/fs/minixfs/mfs.h

    r5a81c5b r86d0b4b3  
    3434#define _MFS_H_
    3535
    36 #include <fs/minix.h>
     36#include <minix.h>
    3737#include "../../vfs/vfs.h"
    3838
Note: See TracChangeset for help on using the changeset viewer.