author | kergoth <kergoth> | 2003-07-01 14:41:48 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-07-01 14:41:48 (UTC) |
commit | 5f0493c41bc87320cd8eca55d998e05a7550dab7 (patch) (side-by-side diff) | |
tree | d2a761c960d1286defdd293861cd634452101abd | |
parent | 99e582c840f0c37d318a28caf69d3ae4eb96bea4 (diff) | |
download | opie-5f0493c41bc87320cd8eca55d998e05a7550dab7.zip opie-5f0493c41bc87320cd8eca55d998e05a7550dab7.tar.gz opie-5f0493c41bc87320cd8eca55d998e05a7550dab7.tar.bz2 |
There's already a lxdialog binary rule in Rules.make, if we specify it with full path using instead of relative. Remove the duplicate lxdialog rule.
-rw-r--r-- | Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -26,103 +26,100 @@ configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPD all : $(TOPDIR)/.config # # The IPK creation is a very slow process. If you want to only create some # IPKs, e.g. the ones in library, then do # make ipks IPK_START=library # and then only the *.control files in this directory will be processed ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config @find $(OPIEDIR)/$(IPK_START) -type f -name \*.control | ( for ctrl in `cat`; do \ prerm=`echo $$ctrl|sed -e 's,\.control$$,.prerm,'`; \ preinst=`echo $$ctrl|sed -e 's,\.control$$,.preinst,'`; \ postrm=`echo $$ctrl|sed -e 's,\.control$$,.postrm,'`; \ postinst=`echo $$ctrl|sed -e 's,\.control$$,.postinst,'`; \ echo "Building ipk of $$ctrl"; \ cd $(OPIEDIR); $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$ctrl --prerm=$$prerm --preinst=$$preinst --postrm=$$postrm --postinst=$$postinst --strip=$(STRIP) $(OPIEDIR); \ done ) $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs clean-configs : @echo "Wiping generated config.in files..." @-rm -f $(configs) ifneq ($(wildcard $(TOPDIR)/.depends.cfgs),) include $(TOPDIR)/.depends.cfgs endif all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) $(call descend,scripts/kconfig,conf) @if [ ! -e $@ ]; then \ cp $(TOPDIR)/def-configs/opie $@; \ fi @$(MAKE) -C scripts/kconfig conf ./scripts/kconfig/conf -s ./config.in # config rules must have the $(configs) var defined # at the time that they run. we must ensure that .depends.cfgs # is built and included by the time we reach this point. xconfig : $(call descend,scripts/kconfig,qconf) LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ ./scripts/kconfig/qconf ./config.in -menuconfig : scripts/lxdialog/lxdialog +menuconfig : $(TOPDIR)/scripts/lxdialog/lxdialog $(call descend,scripts/kconfig,mconf) ./scripts/kconfig/mconf ./config.in -scripts/lxdialog/lxdialog: - make -C scripts/lxdialog - config : $(call descend,scripts/kconfig,conf) ./scripts/kconfig/conf ./config.in oldconfig : $(call descend,scripts/kconfig,conf) ./scripts/kconfig/conf -o ./config.in randconfig : $(call descend,scripts/kconfig,conf) ./scripts/kconfig/conf -r ./config.in allyesconfig : $(call descend,scripts/kconfig,conf) ./scripts/kconfig/conf -y ./config.in allnoconfig : $(call descend,scripts/kconfig,conf) ./scripts/kconfig/conf -n ./config.in defconfig : $(call descend,scripts/kconfig,conf) ./scripts/kconfig/conf -d ./config.in export ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) export include-config := 1 -include $(TOPDIR)/.config -include $(TOPDIR)/.depends endif -include $(TOPDIR)/.config.cmd SUBDIRS = $(subdir-y) all clean install ipk: $(SUBDIRS) lupdate lrelease: @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done opie-lupdate opie-lrelease: @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done $(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \ |