CONFIG_* defines

[Bernhard Fischer]

On Tue, Sep 06, 2005 at 04:18:28PM +0400, Vladimir N. Oleynik wrote:
>Rob,
>
>>> The Busybox has an old problem.
>>> after any usage make config, may be change FEATURE_* only
>>> 1) recompiling applets/* always, but may be not require
>>> 2) do not recompile applets, used this feature
>
>> Our makefile dependencies suck.
>
>Not.
>Our makefile have errors:
>
>1)
>.depend have
>$(wildcard $TOPDIR/config/file.h)
>but must
>$(wildcard $TOPDIR/include/config/file.h)
>
>2)
>The include/config/MARKER: dependece don`t call always
>for update include/config/*
>
>3)
>include/config/feature/ ... bla-bla is unstandardization

also the lists of object files isn't properly initialized, it seems.
Furthermore there is a typo in libunarchive's Makefile.in.

I've attached a minimal correction for this.

thank you,
Bernhard
-------------- next part --------------
diff -X excl -rdup busybox.oorig/archival/libunarchive/Makefile.in busybox.makefile-errors/archival/libunarchive/Makefile.in
--- busybox.oorig/archival/libunarchive/Makefile.in	2005-09-02 13:35:31.000000000 +0200
+++ busybox.makefile-errors/archival/libunarchive/Makefile.in	2005-09-06 14:32:53.198764584 +0200
@@ -56,6 +56,7 @@ DPKG_FILES:= \
 	get_header_tar.o \
 	filter_accept_list_reassign.o
 
+LIBUNARCHIVE-y:=
 LIBUNARCHIVE-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o
 LIBUNARCHIVE-$(CONFIG_BUNZIP2) += decompress_bunzip2.o
 LIBUNARCHIVE-$(CONFIG_CPIO) += get_header_cpio.o
@@ -79,6 +80,6 @@ libraries-y+=$(LIBUNARCHIVE_DIR)$(LIBUNA
 $(LIBUNARCHIVE_DIR)$(LIBUNARCHIVE_AR): $(patsubst %,$(LIBUNARCHIVE_DIR)%, $(LIBUNARCHIVE-y))
 	$(AR) $(ARFLAGS) $@ $(patsubst %,$(LIBUNARCHIVE_DIR)%, $(LIBUNARCHIVE-y))
 
-$(LIBUNARCHIVA_DIR)%.o: $(srcdir)/%.c
+$(LIBUNARCHIVE_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
 
diff -X excl -rdup busybox.oorig/e2fsprogs/Makefile.in busybox.makefile-errors/e2fsprogs/Makefile.in
--- busybox.oorig/e2fsprogs/Makefile.in	2005-09-02 13:35:44.000000000 +0200
+++ busybox.makefile-errors/e2fsprogs/Makefile.in	2005-09-06 14:33:42.559371018 +0200
@@ -51,7 +51,7 @@ UUID_SRC    := compare.c gen_uuid.c pack
 UUID_SRCS   := $(patsubst %,uuid/%, $(UUID_SRC))
 UUID_OBJS   := $(patsubst %.c,%.o, $(UUID_SRCS))
 
-E2FSPROGS-:=
+E2FSPROGS-y:=
 E2FSPROGS-$(CONFIG_CHATTR)     += chattr.o $(E2P_OBJS)
 E2FSPROGS-$(CONFIG_LSATTR)     += lsattr.o $(E2P_OBJS)
 E2FSPROGS-$(CONFIG_MKE2FS)     += mke2fs.o util.o $(E2P_OBJS) $(BLKID_OBJS) $(EXT2FS_OBJS) $(UUID_OBJS)
diff -X excl -rdup busybox.oorig/sysklogd/Makefile.in busybox.makefile-errors/sysklogd/Makefile.in
--- busybox.oorig/sysklogd/Makefile.in	2005-09-02 13:35:32.000000000 +0200
+++ busybox.makefile-errors/sysklogd/Makefile.in	2005-09-06 14:34:52.625295275 +0200
@@ -23,7 +23,7 @@ SYSKLOGD_DIR:=$(top_builddir)/sysklogd/
 endif
 srcdir=$(top_srcdir)/sysklogd
 
-SYSKLOGD-:=
+SYSKLOGD-y:=
 SYSKLOGD-$(CONFIG_KLOGD)		+= klogd.o
 SYSKLOGD-$(CONFIG_LOGGER)		+= logger.o
 SYSKLOGD-$(CONFIG_LOGREAD)		+= logread.o
diff -X excl -rdup busybox.oorig/util-linux/Makefile.in busybox.makefile-errors/util-linux/Makefile.in
--- busybox.oorig/util-linux/Makefile.in	2005-09-02 13:35:50.000000000 +0200
+++ busybox.makefile-errors/util-linux/Makefile.in	2005-09-06 14:34:08.463015717 +0200
@@ -23,7 +23,7 @@ UTILLINUX_DIR:=$(top_builddir)/util-linu
 endif
 srcdir=$(top_srcdir)/util-linux
 
-UTILLINUX-:=
+UTILLINUX-y:=
 UTILLINUX-$(CONFIG_DMESG)		+=dmesg.o
 UTILLINUX-$(CONFIG_FBSET)		+=fbset.o
 UTILLINUX-$(CONFIG_FDFLUSH)		+=fdflush.o