patch for buildrom's unifdef makefile

[Cristi Magherusan]

Unifef's build target used to depend on the .o binary file, instead of
the .c source.

This trivial patch includes a patch for the unifdef makefile and
modifies the build script to apply it.

Signed-off-by: Cristi Măgherușan

[Peter Stuge]

On Sun, Aug 03, 2008 at 12:39:14AM +0300, Cristi Magherusan wrote:
> Unifef's build target used to depend on the .o binary file, instead of
> the .c source.
>
> This trivial patch includes a patch for the unifdef makefile and
> modifies the build script to apply it.
>
> Signed-off-by: Cristi M??gheru??an

Acked-by: Peter Stuge

(sorry for mangling your name here, will make it right in the commit)
> diff --git a/packages/unifdef/patches/series b/packages/unifdef/patches/series
> new file mode 100644
> index 0000000..d350737
> --- /dev/null
> +++ b/packages/unifdef/patches/series
> @@ -0,0 +1 @@
> +unifdef-build-fix.patch
> diff --git a/packages/unifdef/patches/unifdef-build-fix.patch b/packages/unifdef/patches/unifdef-build-fix.patch
> new file mode 100644
> index 0000000..33a6791
> --- /dev/null
> +++ b/packages/unifdef/patches/unifdef-build-fix.patch
> @@ -0,0 +1,14 @@
> +diff -Naur unifdef-1.0.orig/Makefile unifdef-1.0/Makefile
> +--- unifdef-1.0.orig/Makefile	2000-02-12 05:54:36.000000000 +0200
> ++++ unifdef-1.0/Makefile	2008-08-02 23:20:26.000000000 +0300
> +@@ -2,8 +2,8 @@
> CFLAGS = -O2
> DEST   = /usr
>
> +-unifdef: unifdef.o
> +-	$(CC) unifdef.o -o unifdef
> ++unifdef: unifdef.c
> ++	$(CC) unifdef.c -o unifdef
> clean:
> rm -f unifdef *.o
>
> diff --git a/packages/unifdef/unifdef.mk b/packages/unifdef/unifdef.mk
> index b6e344f..d1bc7b3 100644
> --- a/packages/unifdef/unifdef.mk
> +++ b/packages/unifdef/unifdef.mk
> @@ -5,6 +5,8 @@ UNIFDEF_SRC_DIR=$(UNIFDEF_DIR)/unifdef-1.0
>  UNIFDEF_STAMP_DIR=$(UNIFDEF_DIR)/stamps
>  UNIFDEF_LOG_DIR=$(UNIFDEF_DIR)/logs
>
> +UNIFDEF_PATCHES=$(PACKAGE_DIR)/unifdef/patches
>
> ifeq ($(CONFIG_VERBOSE),y)
>  UNIFDEF_BUILD_LOG=/dev/stdout
>  UNIFDEF_CONFIG_LOG=/dev/stdout
> @@ -21,9 +23,14 @@ $(UNIFDEF_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(UNIFDEF_SOURCE) | $(UNIFDEF_STAM
>    @ tar -C $(UNIFDEF_DIR) -zxf $(SOURCE_DIR)/$(UNIFDEF_SOURCE)
>    @ rm -f $(UNIFDEF_SRC_DIR)/unifdef 
>    @ rm -f $(UNIFDEF_SRC_DIR)/unifdef.o
> @ touch $@
> @ touch $@
>
> +$(UNIFDEF_STAMP_DIR)/.patched: $(UNIFDEF_STAMP_DIR)/.unpacked
> @ echo "Patching unifdef..."
> @ $(BIN_DIR)/doquilt.sh $(UNIFDEF_SRC_DIR) $(UNIFDEF_PATCHES)
> @ touch $@
>
> -$(UNIFDEF_SRC_DIR)/unifdef: $(UNIFDEF_STAMP_DIR) $(UNIFDEF_LOG_DIR) $(UNIFDEF_STAMP_DIR)/.unpacked
> +$(UNIFDEF_SRC_DIR)/unifdef: $(UNIFDEF_STAMP_DIR) $(UNIFDEF_LOG_DIR) $(UNIFDEF_STAMP_DIR)/.patched
>    @ echo "Building unifdef (host)..."
>    @ $(MAKE) -C $(UNIFDEF_SRC_DIR) CC=$(HOST_CC) > $(UNIFDEF_BUILD_LOG) 2>&1

[Ward Vandewege]

On Sun, Aug 03, 2008 at 12:39:14AM +0300, Cristi Magherusan wrote:
> Unifef's build target used to depend on the .o binary file, instead of
> the .c source.
>
> This trivial patch includes a patch for the unifdef makefile and
> modifies the build script to apply it.
>
> Signed-off-by: Cristi Măgherușan

Very good, this fixes doing a make distclean after a make.

Acked-by: Ward Vandewege

[Ward Vandewege]

On Sat, Aug 02, 2008 at 06:04:19PM -0400, Ward Vandewege wrote:
> On Sun, Aug 03, 2008 at 12:39:14AM +0300, Cristi Magherusan wrote:
> > Unifef's build target used to depend on the .o binary file, instead of
> > the .c source.
> >
> > This trivial patch includes a patch for the unifdef makefile and
> > modifies the build script to apply it.
> >
> > Signed-off-by: Cristi Măgherușan
>
> Very good, this fixes doing a make distclean after a make.
>
> Acked-by: Ward Vandewege

Committed in r213.

Thanks,
Ward.