CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL51
Changes by: [EMAIL PROTECTED] 2007-09-11 18:31:25
Modified files:
gfs2/fsck : Makefile
Log message:
Resolves: bz 286211: gfs2_fsck not found by fsck wrapper.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL51&r1=1.6.2.2&r2=1.6.2.2.2.1
--- cluster/gfs2/fsck/Makefile 2007/05/01 18:20:49 1.6.2.2
+++ cluster/gfs2/fsck/Makefile 2007/09/11 18:31:25 1.6.2.2.2.1
@@ -14,7 +14,8 @@
include ${top_srcdir}/make/defines.mk
-TARGET= gfs2_fsck
+TARGET1= fsck.gfs2
+TARGET2= gfs2_fsck
INCLUDES= -I${top_srcdir}/include -I${top_srcdir}/config
-I${top_srcdir}/libgfs2 -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
LIBS=${top_srcdir}/libgfs2
@@ -27,38 +28,43 @@
CFLAGS+=-D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM
-DGFS_RELEASE_NAME=\"${RELEASE}\" -Wall -O2
-all: ${TARGET}
+all: depends ${TARGET1} ${TARGET2}
-gfs2_fsck: $(sources:.c=.o) $(LIBS)/libgfs2.a
+${TARGET1}: $(sources:.c=.o)
$(CC) $(CFLAGS) -L$(LIBS) $^ -o $@ -lgfs2
+${TARGET2}: ${TARGET1}
+ ln -f ${TARGET1} ${TARGET2}
+
%.o: %.c
$(CC) -MMD -c $(INCLUDES) $(CFLAGS) $< -o $@
+depends:
+ $(MAKE) -C ../libgfs2 all
test_block_list: log.o test_block_list.o
$(CC) $(CFLAGS) $^ -o $@
test_bitmap: test_bitmap.o log.o
$(CC) $(CFLAGS) $^ -o $@
+
clean:
- @rm -f gfs2_fsck *.o *~ *.d
+ rm -f ${TARGET1} ${TARGET2} *.o *~ *.d cscope.* test_inode_list *.orig
*.rej test_block_list test_bitmap
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
fi
- strip ${TARGET}
- install -m755 ${TARGET} ${sbindir}
+ install -m755 ${TARGET1} ${sbindir}
+ ln -f ${sbindir}/${TARGET1} ${sbindir}/${TARGET2}
distclean: clean
- @rm -f cscope.* gfs2_fsck test_inode_list *.orig *.rej test_block_list
test_bitmap
+ @rm -f cscope.* {TARGET1} test_inode_list *.orig *.rej test_block_list
test_bitmap
-gfs2_fsck.pot: $(sources)
+{TARGET1}.pot: $(sources)
@xgettext -C -F --keyword=print_log --keyword=log_debug
--keyword=log_info --keyword=_ \
--keyword=log_notice --keyword=log_warn --keyword=log_err
--keyword=log_crit \
- --keyword=log_debug --keyword=log_err --keyword=log_print -d -
$(sources) > gfs2_fsck.pot
-
+ --keyword=log_debug --keyword=log_err --keyword=log_print -d -
$(sources) > ${TARGET1}.pot
-include $(sources:.c=.d)
