diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-08-31 04:24:56 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-08-31 04:24:56 +0200 |
| commit | 08ab4e1780fa63c88dd5a5ab52f4ff4ed1ee1878 (patch) | |
| tree | 0b8d061f6fd4b7ad68b94e509e644e5456a44613 /fs/reiserfs | |
| parent | c1de7a6daf9c657484e1c6d433f01fccd49a7f48 (diff) | |
fs: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'fs/reiserfs')
| -rw-r--r-- | fs/reiserfs/Makefile | 6 | ||||
| -rw-r--r-- | fs/reiserfs/dev.c | 4 | ||||
| -rw-r--r-- | fs/reiserfs/mode_string.c | 3 | ||||
| -rw-r--r-- | fs/reiserfs/reiserfs.c | 4 |
4 files changed, 3 insertions, 14 deletions
diff --git a/fs/reiserfs/Makefile b/fs/reiserfs/Makefile index e8711a411a..9cef8ee910 100644 --- a/fs/reiserfs/Makefile +++ b/fs/reiserfs/Makefile @@ -30,10 +30,10 @@ include $(TOPDIR)/config.mk LIB = $(obj)libreiserfs.a AOBJS = -COBJS = reiserfs.o dev.o mode_string.o +COBJS-$(CONFIG_CMD_REISER) := reiserfs.o dev.o mode_string.o -SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS)) +SRCS := $(AOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS-y)) #CPPFLAGS += diff --git a/fs/reiserfs/dev.c b/fs/reiserfs/dev.c index 46dc41463f..1facfaf182 100644 --- a/fs/reiserfs/dev.c +++ b/fs/reiserfs/dev.c @@ -19,8 +19,6 @@ #include <common.h> -#if defined(CONFIG_CMD_REISER) - #include <config.h> #include <reiserfs.h> @@ -119,5 +117,3 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf) return 1; } - -#endif diff --git a/fs/reiserfs/mode_string.c b/fs/reiserfs/mode_string.c index 3e57ee4a93..801263d881 100644 --- a/fs/reiserfs/mode_string.c +++ b/fs/reiserfs/mode_string.c @@ -25,7 +25,6 @@ #include <common.h> -#if defined(CONFIG_CMD_REISER) #include <linux/stat.h> #if ( S_ISUID != 04000 ) || ( S_ISGID != 02000 ) || ( S_ISVTX != 01000 ) \ @@ -137,5 +136,3 @@ const char *bb_mode_string(int mode) } #endif - -#endif diff --git a/fs/reiserfs/reiserfs.c b/fs/reiserfs/reiserfs.c index aa96361638..d84fb20bc7 100644 --- a/fs/reiserfs/reiserfs.c +++ b/fs/reiserfs/reiserfs.c @@ -29,8 +29,6 @@ */ #include <common.h> -#if defined(CONFIG_CMD_REISER) - #include <malloc.h> #include <linux/ctype.h> #include <linux/time.h> @@ -982,5 +980,3 @@ reiserfs_open (char *filename) } return filemax; } - -#endif |