[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[MiNT] [PATCH] Change build directories name from .cpu_$(CPU) to .compile_$(CPU)



Please commit this patch.
Thank you!

Commit message:

Change build directories name from .cpu_$(CPU) to .compile_$(CPU) in
libkern for better consistency for what it's done in other kernel
parts and modules.
Contributed by David Galvez
Index: sys/libkern/.cvsignore
===================================================================
RCS file: /mint/freemint/sys/libkern/.cvsignore,v
retrieving revision 1.2
diff -u -8 -r1.2 .cvsignore
--- sys/libkern/.cvsignore	7 Sep 2000 01:41:22 -0000	1.2
+++ sys/libkern/.cvsignore	16 Dec 2015 16:44:09 -0000
@@ -1,3 +1,3 @@
 *~
 lib*.a
-.cpu_*
+.compile_*
Index: sys/libkern/Makefile
===================================================================
RCS file: /mint/freemint/sys/libkern/Makefile,v
retrieving revision 1.5
diff -u -8 -r1.5 Makefile
--- sys/libkern/Makefile	20 Apr 2001 00:38:37 -0000	1.5
+++ sys/libkern/Makefile	16 Dec 2015 16:44:10 -0000
@@ -15,17 +15,17 @@
 include $(top_srcdir)/RULES
 include $(top_srcdir)/PHONY
 
 all-here: all-libs
 
 # default overwrites
 
 # default definitions
-GENFILES = .cpu_* libkern*.a
+GENFILES = .compile_* libkern*.a
 
 
 help:
 	@echo '#'
 	@echo '# targets:'
 	@echo '# --------'
 	@echo '# - $(cputargets)'
 	@echo '#'
@@ -46,30 +46,30 @@
 	done && test -z "$$fail"
 
 $(cputargets):
 	$(MAKE) libkern$@.a CPU=$@
 
 libkern$(CPU).a: objs asm-files
 	$(shell \
 	  if [ ! -e $@ \
-	         -o .cpu_$(CPU)/objs -nt $@ \
-	         -o asm/.cpu_$(CPU)/asm-files -nt $@ ] ; \
+	         -o .compile_$(CPU)/objs -nt $@ \
+	         -o asm/.compile_$(CPU)/asm-files -nt $@ ] ; \
 	  then \
-		objs=`cat .cpu_$(CPU)/objs` ; \
-		objs=`for i in $$objs ; do echo .cpu_$(CPU)/$$i ; done` ; \
+		objs=`cat .compile_$(CPU)/objs` ; \
+		objs=`for i in $$objs ; do echo .compile_$(CPU)/$$i ; done` ; \
 		\
-		asmobjs=`cat asm/.cpu_$(CPU)/asm-files` ; \
-		asmobjs=`for i in $$asmobjs ;  do echo asm/.cpu_$(CPU)/$$i ; done` ; \
+		asmobjs=`cat asm/.compile_$(CPU)/asm-files` ; \
+		asmobjs=`for i in $$asmobjs ;  do echo asm/.compile_$(CPU)/$$i ; done` ; \
 		\
 		echo "$(RM) $@; $(AR) rc $@ $$objs $$asmobjs; $(RANLIB) $@;" ; \
 	  fi \
 	)
 
-objs: .cpu_$(CPU)
-	cd .cpu_$(CPU); $(MAKE)
+objs: .compile_$(CPU)
+	cd .compile_$(CPU); $(MAKE)
 
-.cpu_$(CPU): Makefile.objs
+.compile_$(CPU): Makefile.objs
 	$(MKDIR) -p $@
 	$(CP) $< $@/Makefile
 
 asm-files:
 	cd asm; $(MAKE) CPU="$(CPU)" asm-files
Index: sys/libkern/Makefile.objs
===================================================================
RCS file: /mint/freemint/sys/libkern/Makefile.objs,v
retrieving revision 1.10
diff -u -8 -r1.10 Makefile.objs
--- sys/libkern/Makefile.objs	24 Mar 2011 22:43:14 -0000	1.10
+++ sys/libkern/Makefile.objs	16 Dec 2015 16:44:10 -0000
@@ -2,17 +2,17 @@
 # Makefile for $(CPU) object modules
 #
 
 SHELL = /bin/sh
 SUBDIRS = 
 
 srcdir = ..
 top_srcdir = ../..
-subdir = .cpu_$(CPU)
+subdir = .compile_$(CPU)
 
 default: all
 
 include $(top_srcdir)/CONFIGVARS
 include $(top_srcdir)/RULES
 include $(top_srcdir)/PHONY
 
 all-here: objs
Index: sys/libkern/asm/.cvsignore
===================================================================
RCS file: /mint/freemint/sys/libkern/asm/.cvsignore,v
retrieving revision 1.2
diff -u -8 -r1.2 .cvsignore
--- sys/libkern/asm/.cvsignore	7 Sep 2000 01:41:22 -0000	1.2
+++ sys/libkern/asm/.cvsignore	16 Dec 2015 16:44:10 -0000
@@ -1,3 +1,3 @@
 *~
 lib*.a
-.cpu_*
+.compile_*
Index: sys/libkern/asm/Makefile
===================================================================
RCS file: /mint/freemint/sys/libkern/asm/Makefile,v
retrieving revision 1.4
diff -u -8 -r1.4 Makefile
--- sys/libkern/asm/Makefile	20 Apr 2001 00:38:37 -0000	1.4
+++ sys/libkern/asm/Makefile	16 Dec 2015 16:44:10 -0000
@@ -15,19 +15,19 @@
 include $(top_srcdir)/RULES
 include $(top_srcdir)/PHONY
 
 all-here: 
 
 # default overwrites
 
 # default definitions
-GENFILES = .cpu_*
+GENFILES = .compile_*
 
 #
 # main target
 #
-asm-files: .cpu_$(CPU)
-	cd .cpu_$(CPU); $(MAKE)
+asm-files: .compile_$(CPU)
+	cd .compile_$(CPU); $(MAKE)
 
-.cpu_$(CPU): Makefile.objs
+.compile_$(CPU): Makefile.objs
 	$(MKDIR) -p $@
 	$(CP) $< $@/Makefile
Index: xaaes/src.km/Makefile.objs
===================================================================
RCS file: /mint/freemint/xaaes/src.km/Makefile.objs,v
retrieving revision 1.19
diff -u -8 -r1.19 Makefile.objs
--- xaaes/src.km/Makefile.objs	13 Aug 2011 19:00:37 -0000	1.19
+++ xaaes/src.km/Makefile.objs	16 Dec 2015 16:44:10 -0000
@@ -31,17 +31,17 @@
 
 LD = $(CC) -nostdlib -Wl,--entry -Wl,_init
 LIBS = -lgem -lgcc
 STRIPFLAGS =
 
 # default definitions
 GENFILES = $(TARGET)
 # hack: link .o-file from libkern (todo!)
-OBJS = $(COBJS:.c=.o) $(SOBJS:.S=.o) $(top_srcdir)/../../sys/libkern/.cpu_$(CPU)/strings.o
+OBJS = $(COBJS:.c=.o) $(SOBJS:.S=.o) $(top_srcdir)/../../sys/libkern/.compile_$(CPU)/strings.o
 
 VPATH = ..
 
 #
 # main target
 #
 build: $(TARGET)