diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-27 17:24:01 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-27 17:24:01 +0200 |
| commit | 76dade1788965d0d31e57d080854dddb5e74783f (patch) | |
| tree | e40baee34f71aa399937b864b77165e9fc628db2 /package/config/Makefile | |
| parent | 6fecd53e99591775a4117e9e1ba18043fda36b27 (diff) | |
| parent | 6cd6353ff9c0ce93a63e43c4cb61188c6bc0b0f5 (diff) | |
| download | buildroot-novena-76dade1788965d0d31e57d080854dddb5e74783f.tar.gz buildroot-novena-76dade1788965d0d31e57d080854dddb5e74783f.zip | |
Merge branch 'kconfig-update' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/config/Makefile')
| -rw-r--r-- | package/config/Makefile | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/package/config/Makefile b/package/config/Makefile index 3af4bd8de..a2184fa3c 100644 --- a/package/config/Makefile +++ b/package/config/Makefile @@ -14,7 +14,10 @@ __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m)) host-csingle := $(foreach m,$(__hostprogs),$(if $($(m)-objs),,$(m))) host-cmulti := $(foreach m,$(__hostprogs),\ $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m)))) +host-cxxmulti := $(foreach m,$(__hostprogs),\ + $(if $($(m)-cxxobjs),$(m),$(if $($(m)-objs),))) host-cobjs := $(sort $(foreach m,$(__hostprogs),$($(m)-objs))) +host-cxxobjs := $(sort $(foreach m,$(__hostprogs),$($(m)-cxxobjs))) $(host-csingle): %: %.c $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< $(HOST_LOADLIBES) -o $@ @@ -22,9 +25,15 @@ $(host-csingle): %: %.c $(host-cmulti): %: $(host-cobjs) $(host-cshlib) $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $($@-objs) $(HOST_LOADLIBES) -o $@ +$(host-cxxmulti): %: $(host-cxxobjs) $(host-cobjs) $(host-cshlib) + $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $($@-objs) $($@-cxxobjs) $(HOSTLOADLIBES_$@) -o $@ + $(host-cobjs): %.o: %.c $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) -c $< -o $@ +$(host-cxxobjs): %.o: %.cc + $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$@) -c $< -o $@ + $(obj)/%:: $(src)/%_shipped $(Q)cat $< > $@ |