From: David Schleef Date: Wed, 1 Oct 2003 22:30:09 +0000 (+0000) Subject: Remove old files X-Git-Tag: r0_7_69~191 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b11d4e8760f2d87527e54718eeaf85e58904136;p=comedi.git Remove old files --- diff --git a/Makefile.in.append b/Makefile.in.append deleted file mode 100644 index 369b2523..00000000 --- a/Makefile.in.append +++ /dev/null @@ -1,3 +0,0 @@ - -link_subdirs(comedi) - diff --git a/Makefile.modbuild b/Makefile.modbuild deleted file mode 100644 index 993489c9..00000000 --- a/Makefile.modbuild +++ /dev/null @@ -1,139 +0,0 @@ - --include .buildvars - - -.EXPORT_ALL_VARIABLES: -CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ - else if [ -x /bin/bash ]; then echo /bin/bash; \ - else echo sh; fi ; fi) -TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) - -HPATH = $(TOPDIR)/include -FINDHPATH = $(HPATH) - -HOSTCC =gcc -HOSTCFLAGS =-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer - -# -# Include the make variables (CC, etc...) -# - -#AS = $(CROSS_COMPILE)as -#LD = $(CROSS_COMPILE)ld -#CC = $(CROSS_COMPILE)gcc -CPP = $(CC) -E -AR = $(CROSS_COMPILE)ar -NM = $(CROSS_COMPILE)nm -STRIP = $(CROSS_COMPILE)strip -OBJCOPY = $(CROSS_COMPILE)objcopy -OBJDUMP = $(CROSS_COMPILE)objdump -MAKEFILES = $(TOPDIR)/.config -GENKSYMS = /sbin/genksyms -MODFLAGS = -DMODULE -PERL = perl - -export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \ - CONFIG_SHELL TOPDIR HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \ - CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS MODFLAGS PERL - -MODLIB := $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE) -export MODLIB - -export FLAT_MODULES - -CFLAGS := -I $(TOPDIR)/include $(CFLAGS) - -CFLAGS += -nostdinc -I $(shell $(CC) -print-search-dirs|grep ^install:|sed 's/^install: //')include - -PROJECTRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) - --include $(LINUXDIR)/.config - -ifeq (.config,$(wildcard .config)) -include .config -ifeq (.depend,$(wildcard .depend)) -include .depend -all: modules -else -all: depend modules -endif -else -all: config -endif - -oldconfig: dummy - env -i PATH=$(PATH) $(CONFIG_SHELL) ./configure --old - -#configure is called through env -i to prevent loading of variables from stale LINUXDIR -config: dummy - env -i PATH=$(PATH) $(CONFIG_SHELL) ./configure --linuxdir $(LINUXDIR) - -modules_install: $(patsubst %, _modinst_%, $(SUBDIRS)) -ifeq ($(INSTALL_MOD_PATH),) -ifeq ($(KERNELRELEASE),$(shell uname -r)) - /sbin/depmod -ae -endif -endif - -_modinst_%: - $(MAKE) -C $(patsubst _modinst_%, %, $@) modules_install - - -ifeq ($(CONFIG_MODVERSIONS),y) -MODFLAGS += -DMODVERSIONS -include $(LINUXDIR)/include/linux/modversions.h -endif - - -modules: $(patsubst %, _mod_%, $(SUBDIRS)) - -$(patsubst %, _mod_%, $(SUBDIRS)) : dummy - $(MAKE) -C $(patsubst _mod_%, %, $@) CFLAGS="$(CFLAGS)" MAKING_MODULES=1 modules - -include/version.h: Makefile - @echo \#define $(PROJECT)_RELEASE \"$(PROJECTRELEASE)\" >.ver - @echo \#define $(PROJECT)_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` >> .ver - @echo '#define $(PROJECT)_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))' >>.ver - @mv -f .ver $@ - -depend: dep-files - -dep-files: scripts/mkdep include/version.h new-genksyms -# scripts/mkdep `find $(FINDHPATH) -follow -name \*.h ! -name modversions.h -print` > .hdepend -# let this be made through the fastdep rule in Rules.make - $(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)" - - -new-genksyms: - -clean: - rm -f core `find . -name '*.[oas]'` - rm -f core `find . -name '.*.flags' -print` - -distclean: clean - rm -f .depend `find . -name .depend -print` - rm -f .hdepend - rm -f core `find . \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ - -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ - -o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -print` TAGS - rm -f `find comedi -name Makefile -print` - -rm -rf modules - rm -f .config .config.old - rm -f include/config.h include/version.h - rm -f scripts/mkdep - rm -f .buildvars - -include $(TOPDIR)/Rules.make - - -dummy: - -# -# This generates dependencies for the .h files. -# - -scripts/mkdep: scripts/mkdep.c - $(HOSTCC) $(HOSTCFLAGS) -o scripts/mkdep scripts/mkdep.c - -scripts/split-include: scripts/split-include.c - $(HOSTCC) $(HOSTCFLAGS) -o scripts/split-include scripts/split-include.c - diff --git a/Rules.make b/Rules.make deleted file mode 100644 index ae1ffdbb..00000000 --- a/Rules.make +++ /dev/null @@ -1,335 +0,0 @@ -# -# This file is derived from linux-2.4.16/Rules.make -# - -# -# This file contains rules which are shared between multiple Makefiles. -# - -# -# False targets. -# -.PHONY: dummy - -# -# Special variables which should not be exported -# -unexport EXTRA_AFLAGS -unexport EXTRA_CFLAGS -unexport EXTRA_LDFLAGS -unexport EXTRA_ARFLAGS -unexport SUBDIRS -unexport SUB_DIRS -unexport ALL_SUB_DIRS -unexport MOD_SUB_DIRS -unexport O_TARGET -unexport ALL_MOBJS - -unexport obj-y -unexport obj-m -unexport obj-n -unexport obj- -unexport export-objs -unexport subdir-y -unexport subdir-m -unexport subdir-n -unexport subdir- - -# -# Get things started. -# -first_rule: sub_dirs - $(MAKE) all_targets - -both-m := $(filter $(mod-subdirs), $(subdir-y)) -SUB_DIRS := $(subdir-y) -MOD_SUB_DIRS := $(sort $(subdir-m) $(both-m)) -ALL_SUB_DIRS := $(sort $(subdir-y) $(subdir-m) $(subdir-n) $(subdir-)) - - -# -# Common rules -# - -%.s: %.c - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -S $< -o $@ - -%.i: %.c - $(CPP) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) $< > $@ - -%.o: %.c - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -c -o $@ $< - @ ( \ - echo 'ifeq ($(strip $(subst $(comma),:,$(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@))),$$(strip $$(subst $$(comma),:,$$(CFLAGS) $$(EXTRA_CFLAGS) $$(CFLAGS_$@))))' ; \ - echo 'FILES_FLAGS_UP_TO_DATE += $@' ; \ - echo 'endif' \ - ) > $(dir $@)/.$(notdir $@).flags - -%.o: %.s - $(AS) $(AFLAGS) $(EXTRA_CFLAGS) -o $@ $< - -# Old makefiles define their own rules for compiling .S files, -# but these standard rules are available for any Makefile that -# wants to use them. Our plan is to incrementally convert all -# the Makefiles to these standard rules. -- rmk, mec -ifdef USE_STANDARD_AS_RULE - -%.s: %.S - $(CPP) $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$@) $< > $@ - -%.o: %.S - $(CC) $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$@) -c -o $@ $< - -endif - -%.lst: %.c - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -g -c -o $*.o $< - $(TOPDIR)/scripts/makelst $* $(TOPDIR) $(OBJDUMP) -# -# -# -all_targets: $(O_TARGET) $(L_TARGET) - -# -# Rule to compile a set of .o files into one .o file -# -ifdef O_TARGET -$(O_TARGET): $(obj-y) - rm -f $@ - ifneq "$(strip $(obj-y))" "" - $(LD) $(EXTRA_LDFLAGS) -r -o $@ $(filter $(obj-y), $^) - else - $(AR) rcs $@ - endif - @ ( \ - echo 'ifeq ($(strip $(subst $(comma),:,$(EXTRA_LDFLAGS) $(obj-y))),$$(strip $$(subst $$(comma),:,$$(EXTRA_LDFLAGS) $$(obj-y))))' ; \ - echo 'FILES_FLAGS_UP_TO_DATE += $@' ; \ - echo 'endif' \ - ) > $(dir $@)/.$(notdir $@).flags -endif # O_TARGET - -# -# Rule to compile a set of .o files into one .a file -# -ifdef L_TARGET -$(L_TARGET): $(obj-y) - rm -f $@ - $(AR) $(EXTRA_ARFLAGS) rcs $@ $(obj-y) - @ ( \ - echo 'ifeq ($(strip $(subst $(comma),:,$(EXTRA_ARFLAGS) $(obj-y))),$$(strip $$(subst $$(comma),:,$$(EXTRA_ARFLAGS) $$(obj-y))))' ; \ - echo 'FILES_FLAGS_UP_TO_DATE += $@' ; \ - echo 'endif' \ - ) > $(dir $@)/.$(notdir $@).flags -endif - - -# -# This make dependencies quickly -# -fastdep: dummy - $(TOPDIR)/scripts/mkdep $(CFLAGS) $(EXTRA_CFLAGS) -- $(wildcard *.[chS]) > .depend -ifdef ALL_SUB_DIRS - $(MAKE) $(patsubst %,_sfdep_%,$(ALL_SUB_DIRS)) _FASTDEP_ALL_SUB_DIRS="$(ALL_SUB_DIRS)" -endif - -ifdef _FASTDEP_ALL_SUB_DIRS -$(patsubst %,_sfdep_%,$(_FASTDEP_ALL_SUB_DIRS)): - $(MAKE) -C $(patsubst _sfdep_%,%,$@) fastdep -endif - - -# -# A rule to make subdirectories -# -subdir-list = $(sort $(patsubst %,_subdir_%,$(SUB_DIRS))) -sub_dirs: dummy $(subdir-list) - -ifdef SUB_DIRS -$(subdir-list) : dummy - $(MAKE) -C $(patsubst _subdir_%,%,$@) -endif - -# -# A rule to make modules -# -ALL_MOBJS = $(filter-out $(obj-y), $(obj-m)) -ifneq "$(strip $(ALL_MOBJS))" "" -MOD_DESTDIR := $(shell $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh) -endif - -unexport MOD_DIRS -MOD_DIRS := $(MOD_SUB_DIRS) $(MOD_IN_SUB_DIRS) -ifneq "$(strip $(MOD_DIRS))" "" -.PHONY: $(patsubst %,_modsubdir_%,$(MOD_DIRS)) -$(patsubst %,_modsubdir_%,$(MOD_DIRS)) : dummy - $(MAKE) -C $(patsubst _modsubdir_%,%,$@) modules - -.PHONY: $(patsubst %,_modinst_%,$(MOD_DIRS)) -$(patsubst %,_modinst_%,$(MOD_DIRS)) : dummy - $(MAKE) -C $(patsubst _modinst_%,%,$@) modules_install -endif - -.PHONY: modules -modules: $(ALL_MOBJS) dummy \ - $(patsubst %,_modsubdir_%,$(MOD_DIRS)) - -.PHONY: _modinst__ -_modinst__: dummy -ifneq "$(strip $(ALL_MOBJS))" "" -ifeq "$(FLAT_MODULES)" "yes" - mkdir -p $(MODLIB)/misc/ - cp $(ALL_MOBJS) $(MODLIB)/misc/ -else - mkdir -p $(MODLIB)/$(project)/$(MOD_DESTDIR) - cp $(ALL_MOBJS) $(MODLIB)/$(project)/$(MOD_DESTDIR)$(MOD_TARGET) -endif -endif - -.PHONY: modules_install -modules_install: _modinst__ \ - $(patsubst %,_modinst_%,$(MOD_DIRS)) - -# -# A rule to do nothing -# -dummy: - -# -# This is useful for testing -# -script: - $(SCRIPT) - -# -# This sets version suffixes on exported symbols -# Separate the object into "normal" objects and "exporting" objects -# Exporting objects are: all objects that define symbol tables -# -ifdef CONFIG_MODULES - -multi-used := $(filter $(list-multi), $(obj-y) $(obj-m)) -multi-objs := $(foreach m, $(multi-used), $($(basename $(m))-objs)) -active-objs := $(sort $(multi-objs) $(obj-y) $(obj-m)) - -ifdef never_generate_CONFIG_MODVERSIONS -ifneq "$(strip $(export-objs))" "" - -MODINCL = $(TOPDIR)/include/linux/modules - -# The -w option (enable warnings) for genksyms will return here in 2.1 -# So where has it gone? -# -# Added the SMP separator to stop module accidents between uniprocessor -# and SMP Intel boxes - AC - from bits by Michael Chastain -# - -ifdef CONFIG_SMP - genksyms_smp_prefix := -p smp_ -else - genksyms_smp_prefix := -endif - -$(MODINCL)/%.ver: %.c - @if [ ! -r $(MODINCL)/$*.stamp -o $(MODINCL)/$*.stamp -ot $< ]; then \ - echo '$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $<'; \ - echo '| $(GENKSYMS) $(genksyms_smp_prefix) -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) > $@.tmp'; \ - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $< \ - | $(GENKSYMS) $(genksyms_smp_prefix) -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) > $@.tmp; \ - if [ -r $@ ] && cmp -s $@ $@.tmp; then echo $@ is unchanged; rm -f $@.tmp; \ - else echo mv $@.tmp $@; mv -f $@.tmp $@; fi; \ - fi; touch $(MODINCL)/$*.stamp - -$(addprefix $(MODINCL)/,$(export-objs:.o=.ver)): $(TOPDIR)/include/linux/autoconf.h - -# updates .ver files but not modversions.h -fastdep: $(addprefix $(MODINCL)/,$(export-objs:.o=.ver)) - -# updates .ver files and modversions.h like before (is this needed?) -dep: fastdep update-modverfile - -endif # export-objs - -# update modversions.h, but only if it would change -update-modverfile: - @(echo "#ifndef _LINUX_MODVERSIONS_H";\ - echo "#define _LINUX_MODVERSIONS_H"; \ - echo "#include "; \ - cd $(TOPDIR)/include/linux/modules; \ - for f in *.ver; do \ - if [ -f $$f ]; then echo "#include "; fi; \ - done; \ - echo "#endif"; \ - ) > $(TOPDIR)/include/linux/modversions.h.tmp - @if [ -r $(TOPDIR)/include/linux/modversions.h ] && cmp -s $(TOPDIR)/include/linux/modversions.h $(TOPDIR)/include/linux/modversions.h.tmp; then \ - echo $(TOPDIR)/include/linux/modversions.h was not updated; \ - rm -f $(TOPDIR)/include/linux/modversions.h.tmp; \ - else \ - echo $(TOPDIR)/include/linux/modversions.h was updated; \ - mv -f $(TOPDIR)/include/linux/modversions.h.tmp $(TOPDIR)/include/linux/modversions.h; \ - fi - -$(active-objs): $(TOPDIR)/include/linux/modversions.h - -else - -$(TOPDIR)/include/linux/modversions.h: -# @echo "#include " > $@ - -endif # CONFIG_MODVERSIONS - -ifneq "$(strip $(export-objs))" "" -$(export-objs): $(export-objs:.o=.c) $(LINUXDIR)/include/linux/modversions.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -DEXPORT_SYMTAB -c $(@:.o=.c) - @ ( \ - echo 'ifeq ($(strip $(subst $(comma),:,$(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -DEXPORT_SYMTAB)),$$(strip $$(subst $$(comma),:,$$(CFLAGS) $$(EXTRA_CFLAGS) $$(CFLAGS_$@) -DEXPORT_SYMTAB)))' ; \ - echo 'FILES_FLAGS_UP_TO_DATE += $@' ; \ - echo 'endif' \ - ) > $(dir $@)/.$(notdir $@).flags -endif - -endif # CONFIG_MODULES - - -# -# include dependency files if they exist -# -ifneq ($(wildcard .depend),) -include .depend -endif - -ifneq ($(wildcard $(TOPDIR)/.hdepend),) -include $(TOPDIR)/.hdepend -endif - -# -# Find files whose flags have changed and force recompilation. -# For safety, this works in the converse direction: -# every file is forced, except those whose flags are positively up-to-date. -# -FILES_FLAGS_UP_TO_DATE := - -# For use in expunging commas from flags, which mung our checking. -comma = , - -FILES_FLAGS_EXIST := $(wildcard .*.flags) -ifneq ($(FILES_FLAGS_EXIST),) -include $(FILES_FLAGS_EXIST) -endif - -FILES_FLAGS_CHANGED := $(strip \ - $(filter-out $(FILES_FLAGS_UP_TO_DATE), \ - $(O_TARGET) $(L_TARGET) $(active-objs) \ - )) - -# A kludge: .S files don't get flag dependencies (yet), -# because that will involve changing a lot of Makefiles. Also -# suppress object files explicitly listed in $(IGNORE_FLAGS_OBJS). -# This allows handling of assembly files that get translated into -# multiple object files (see arch/ia64/lib/idiv.S, for example). -FILES_FLAGS_CHANGED := $(strip \ - $(filter-out $(patsubst %.S, %.o, $(wildcard *.S) $(IGNORE_FLAGS_OBJS)), \ - $(FILES_FLAGS_CHANGED))) - -ifneq ($(FILES_FLAGS_CHANGED),) -$(FILES_FLAGS_CHANGED): dummy -endif