fix broken whitespace and remove pointless mkdir
This commit is contained in:
parent
a1c6a57fea
commit
97b43a7999
@ -26,28 +26,28 @@ srcdir=$(top_srcdir)/e2fsprogs
|
|||||||
E2FSPROGS_CFLAGS := -I$(srcdir) -include $(srcdir)/e2fsbb.h
|
E2FSPROGS_CFLAGS := -I$(srcdir) -include $(srcdir)/e2fsbb.h
|
||||||
|
|
||||||
BLKID_SRC := cache.c dev.c devname.c devno.c blkid_getsize.c \
|
BLKID_SRC := cache.c dev.c devname.c devno.c blkid_getsize.c \
|
||||||
probe.c read.c resolve.c save.c tag.c resolve.c
|
probe.c read.c resolve.c save.c tag.c resolve.c
|
||||||
BLKID_SRCS := $(patsubst %,blkid/%, $(BLKID_SRC))
|
BLKID_SRCS := $(patsubst %,blkid/%, $(BLKID_SRC))
|
||||||
BLKID_OBJS := $(patsubst %.c,%.o, $(BLKID_SRCS))
|
BLKID_OBJS := $(patsubst %.c,%.o, $(BLKID_SRCS))
|
||||||
|
|
||||||
E2P_SRC := fgetsetflags.c fgetsetversion.c pf.c iod.c mntopts.c \
|
E2P_SRC := fgetsetflags.c fgetsetversion.c pf.c iod.c mntopts.c \
|
||||||
feature.c ls.c uuid.c pe.c ostype.c ps.c hashstr.c \
|
feature.c ls.c uuid.c pe.c ostype.c ps.c hashstr.c \
|
||||||
parse_num.c
|
parse_num.c
|
||||||
E2P_SRCS := $(patsubst %,e2p/%, $(E2P_SRC))
|
E2P_SRCS := $(patsubst %,e2p/%, $(E2P_SRC))
|
||||||
E2P_OBJS := $(patsubst %.c,%.o, $(E2P_SRCS))
|
E2P_OBJS := $(patsubst %.c,%.o, $(E2P_SRCS))
|
||||||
|
|
||||||
EXT2FS_SRC := gen_bitmap.c bitops.c ismounted.c mkjournal.c unix_io.c \
|
EXT2FS_SRC := gen_bitmap.c bitops.c ismounted.c mkjournal.c unix_io.c \
|
||||||
rw_bitmaps.c initialize.c bitmaps.c block.c \
|
rw_bitmaps.c initialize.c bitmaps.c block.c \
|
||||||
ind_block.c inode.c freefs.c alloc_stats.c closefs.c \
|
ind_block.c inode.c freefs.c alloc_stats.c closefs.c \
|
||||||
openfs.c io_manager.c finddev.c read_bb.c alloc.c badblocks.c \
|
openfs.c io_manager.c finddev.c read_bb.c alloc.c badblocks.c \
|
||||||
getsize.c getsectsize.c alloc_tables.c read_bb_file.c mkdir.c \
|
getsize.c getsectsize.c alloc_tables.c read_bb_file.c mkdir.c \
|
||||||
bb_inode.c newdir.c alloc_sb.c lookup.c dirblock.c expanddir.c \
|
bb_inode.c newdir.c alloc_sb.c lookup.c dirblock.c expanddir.c \
|
||||||
dir_iterate.c link.c res_gdt.c
|
dir_iterate.c link.c res_gdt.c
|
||||||
EXT2FS_SRCS := $(patsubst %,ext2fs/%, $(EXT2FS_SRC))
|
EXT2FS_SRCS := $(patsubst %,ext2fs/%, $(EXT2FS_SRC))
|
||||||
EXT2FS_OBJS := $(patsubst %.c,%.o, $(EXT2FS_SRCS))
|
EXT2FS_OBJS := $(patsubst %.c,%.o, $(EXT2FS_SRCS))
|
||||||
|
|
||||||
UUID_SRC := compare.c gen_uuid.c pack.c parse.c unpack.c unparse.c \
|
UUID_SRC := compare.c gen_uuid.c pack.c parse.c unpack.c unparse.c \
|
||||||
uuid_time.c
|
uuid_time.c
|
||||||
UUID_SRCS := $(patsubst %,uuid/%, $(UUID_SRC))
|
UUID_SRCS := $(patsubst %,uuid/%, $(UUID_SRC))
|
||||||
UUID_OBJS := $(patsubst %.c,%.o, $(UUID_SRCS))
|
UUID_OBJS := $(patsubst %.c,%.o, $(UUID_SRCS))
|
||||||
|
|
||||||
@ -63,7 +63,5 @@ libraries-y+=$(E2FSPROGS_DIR)$(E2FSPROGS_AR)
|
|||||||
$(E2FSPROGS_DIR)$(E2FSPROGS_AR): $(patsubst %,$(E2FSPROGS_DIR)%, $(E2FSPROGS-y))
|
$(E2FSPROGS_DIR)$(E2FSPROGS_AR): $(patsubst %,$(E2FSPROGS_DIR)%, $(E2FSPROGS-y))
|
||||||
$(AR) $(ARFLAGS) $@ $(patsubst %,$(E2FSPROGS_DIR)%, $(E2FSPROGS-y))
|
$(AR) $(ARFLAGS) $@ $(patsubst %,$(E2FSPROGS_DIR)%, $(E2FSPROGS-y))
|
||||||
|
|
||||||
# for e2p/*: check if the dir exists, dude
|
|
||||||
$(E2FSPROGS_DIR)%.o: $(srcdir)/%.c
|
$(E2FSPROGS_DIR)%.o: $(srcdir)/%.c
|
||||||
@[ -d $(@D) ] || mkdir -v $(@D)
|
|
||||||
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(E2FSPROGS_CFLAGS) -c -o $@ $<
|
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(E2FSPROGS_CFLAGS) -c -o $@ $<
|
||||||
|
Loading…
Reference in New Issue
Block a user