Permalink
Browse files

retool build utils

  • Loading branch information...
klange committed Dec 6, 2012
1 parent e9f89f1 commit 942c49806ba92109d65e9ef9cd1818c898f69eab
Showing with 8 additions and 9 deletions.
  1. +1 −2 Makefile
  2. +1 −1 image-builder
  3. +1 −1 userspace/Makefile
  4. +1 −1 util/mk-beg
  5. +1 −1 util/mk-beg-rm
  6. +2 −2 util/mk-end
  7. +1 −1 util/mk-end-rm
View
@@ -21,9 +21,8 @@ MISCMODS = $(patsubst %.c,%.o,$(wildcard kernel/misc/*.c))
SYSTEM = $(patsubst %.c,%.o,$(wildcard kernel/sys/*.c))
DATASTRUCTS = $(patsubst %.c,%.o,$(wildcard kernel/ds/*.c))
CPUBITS = $(patsubst %.c,%.o,$(wildcard kernel/cpu/*.c))
-REALEMU = $(patsubst %.c,%.o,$(wildcard kernel/v8086/*.c))
-SUBMODULES = ${MODULES} ${FILESYSTEMS} ${VIDEODRIVERS} ${DEVICES} ${VIRTUALMEM} ${MISCMODS} ${SYSTEM} ${DATASTRUCTS} ${CPUBITS} ${REALEMU}
+SUBMODULES = ${MODULES} ${FILESYSTEMS} ${VIDEODRIVERS} ${DEVICES} ${VIRTUALMEM} ${MISCMODS} ${SYSTEM} ${DATASTRUCTS} ${CPUBITS}
UTILITIES = util/bin/readelf util/bin/typewriter util/bin/bim
EMU = qemu-system-i386
View
@@ -39,7 +39,7 @@ clean:
@${ENDRM} "RM" "Cleaned userspace full-toolchain applications."
${FTARGETS}: $(TARGETDIR)% : %.c ${LOCAL_LIBS}
- @${BEG} "CC" "$@ $< [w/libs]"
+ @${BEG} "CC" "$< [w/libs]"
@${CC} -flto ${CFLAGS} ${EXTRAFLAGS} ${FREETYPE_INC} -o $@ $< ${LOCAL_LIBS} ${LIBM} ${FREETYPE_LIB} ${LIBPNG} ${LIBZ} ${ERRORS}
@${STRIP} $@
@${END} "CC" "$< [w/libs]"
View
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
echo -n > /tmp/.`whoami`-build-errors
CMD=`cpad "$1" 8 " "`
-echo -e -n "\033[32m${CMD}${2}\033[0m\n"
+echo -e -n "\033[32m${CMD}${2}\033[0m"
View
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
echo -n > /tmp/.`whoami`-build-errors
CMD=`cpad "$1" 8 " "`
-echo -e -n "\033[31m${CMD}${2}\033[0m\n"
+echo -e -n "\033[31m${CMD}${2}\033[0m"
View
@@ -5,8 +5,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
CMD=`cpad "$1" 8 " "`
if [[ -s /tmp/.`whoami`-build-errors ]] ; then
- cat /tmp/.`whoami`-build-errors
echo -e -n "\r\033[1;33m${CMD}${2}\033[0m\n"
+ cat /tmp/.`whoami`-build-errors
else
- echo -e -n "\r\033[A\033[1;32m${CMD}${2}\033[0m\033[K\n"
+ echo -e -n "\r\033[1;32m${CMD}${2}\033[0m\033[K\n"
fi
View
@@ -4,4 +4,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
. "$DIR/cpad.sh"
CMD=`cpad "$1" 8 " "`
-echo -e -n "\r\033[A\033[1;31m${CMD}${2}\033[0m\033[K\n"
+echo -e -n "\r\033[1;31m${CMD}${2}\033[0m\033[K\n"

0 comments on commit 942c498

Please sign in to comment.