6997e461fd
Our kconfig code is updated to the version of kernel 3.9-rc2. No major issues during the migration, except: * Some conflicts when applying 03-change-config-option-prefix.patch due to upstream kernel changes. * The need of adding a new patch, 15-fix-qconf-moc-rule.patch, to fix the make rule that generates the moc file for the Qt-based interface. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
81 lines
2.5 KiB
Diff
81 lines
2.5 KiB
Diff
---
|
|
Makefile.br | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
foo.h | 12 ++++++++++++
|
|
2 files changed, 65 insertions(+)
|
|
|
|
Index: b/Makefile.br
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ b/Makefile.br
|
|
@@ -0,0 +1,53 @@
|
|
+src := .
|
|
+top_srcdir=../../
|
|
+top_builddir=../../
|
|
+srctree := .
|
|
+obj ?= .
|
|
+
|
|
+include Makefile
|
|
+#HOSTCFLAGS+=-Dinline="" -include foo.h
|
|
+-include $(obj)/.depend
|
|
+$(obj)/.depend: $(wildcard *.h *.c)
|
|
+ $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) -MM *.c > $@ 2>/dev/null || :
|
|
+
|
|
+__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 := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-objs))))
|
|
+host-cxxobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-cxxobjs))))
|
|
+
|
|
+HOST_EXTRACFLAGS += -I$(obj)
|
|
+
|
|
+$(host-csingle): %: %.c
|
|
+ $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< -o $(obj)/$@
|
|
+
|
|
+$(host-cmulti): %: $(host-cobjs) $(host-cshlib)
|
|
+ $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs)) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@
|
|
+
|
|
+$(host-cxxmulti): %: $(host-cxxobjs) $(host-cobjs) $(host-cshlib)
|
|
+ $(HOSTCXX) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs) $($(@F)-cxxobjs)) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@
|
|
+
|
|
+$(obj)/%.o: %.c
|
|
+ $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$(@F)) -c $< -o $@
|
|
+
|
|
+$(obj)/%.o: $(obj)/%.c
|
|
+ $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$(@F)) -c $< -o $@
|
|
+
|
|
+$(obj)/%.o: %.cc
|
|
+ $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$(@F)) -c $< -o $@
|
|
+
|
|
+$(obj)/%:: $(src)/%_shipped
|
|
+ $(Q)cat $< > $@
|
|
+
|
|
+clean:
|
|
+ $(Q)rm -f $(addprefix $(obj)/,$(clean-files))
|
|
+distclean: clean
|
|
+ $(Q)rm -f $(addprefix $(obj)/,$(lxdialog) $(conf-objs) $(mconf-objs) $(kxgettext-objs) \
|
|
+ $(hostprogs-y) $(qconf-cxxobjs) $(qconf-objs) $(gconf-objs) \
|
|
+ mconf .depend)
|
|
+
|
|
+FORCE:
|
|
+.PHONY: FORCE clean distclean
|
|
Index: b/foo.h
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ b/foo.h
|
|
@@ -0,0 +1,12 @@
|
|
+#ifndef __KCONFIG_FOO_H
|
|
+#define __KCONFIG_FOO_H
|
|
+
|
|
+#ifndef __APPLE__
|
|
+#include <features.h>
|
|
+#endif
|
|
+#include <limits.h>
|
|
+
|
|
+#ifndef PATH_MAX
|
|
+#define PATH_MAX 1024
|
|
+#endif
|
|
+#endif /* __KCONFIG_FOO_H */
|