Commit 31bc45f4 authored by ROOL's avatar ROOL 🤖

Minor makefile tidying

Admin:
  Makefile use mkdir instead of cdir; some spaces exchanged for tabs
  JPEG/Makefile add a dummy command for export_libs so amu has something to do
  test/Makefile link order changed so it links
parent b0f36803
......@@ -143,6 +143,7 @@ OBJSZ =\
# build a the library:
#
all install export_libs: ${COMPONENT} ${COMPONENTZ}
@| Done
export: export_libs export_hdrs
......
......@@ -33,7 +33,7 @@ LIBDIR = <Lib$Dir>
#
# Generic options:
#
MKDIR = cdir
MKDIR = mkdir -p
AS = objasm
CP = copy
CC = cc
......@@ -151,24 +151,24 @@ ${JPEGLIB}:
export: export_${PHASE}
clean:
${WIPE} o ${WFLAGS}
${WIPE} z ${WFLAGS}
@echo ${COMPONENT}: cleaned
${WIPE} o ${WFLAGS}
${WIPE} z ${WFLAGS}
@echo ${COMPONENT}: cleaned
clean_all:
Dir PNG
amu clean
Dir PNG
amu clean
back
Dir JPEG
amu clean
Dir JPEG
amu clean
back
@echo ${COMPONENT}: cleaned
${WIPE} o ${WFLAGS}
${WIPE} z ${WFLAGS}
${WIPE} o ${WFLAGS}
${WIPE} z ${WFLAGS}
@echo ${COMPONENT}: all cleaned
export_hdrs: h.imagetrans o.dirs
export_hdrs: h.imagetrans ${PNGHDRS} o.dirs
${CP} h.imagetrans ${LIBDIR}.ImageLib.h.imagetrans ~CFLNR~V
@echo ${COMPONENT}: export complete (hdrs)
@echo ${COMPONENT}: export complete (hdrs)
export_libs: ${TARGET} ${TARGETZ} o.dirs
${CP} ${TARGET} ${LIBDIR}.ImageLib.${TARGET} ~CFLNR~V
......@@ -176,7 +176,7 @@ export_libs: ${TARGET} ${TARGETZ} o.dirs
${CP} ${PNGLIB} ${LIBDIR}.ImageLib.o.libpng-lib ~CFLNR~V
${CP} ${PNGLIBZ} ${LIBDIR}.ImageLib.o.libpng-lzm ~CFLNR~V
${CP} ${JPEGLIB} ${LIBDIR}.ImageLib.o.libjpeg ~CFLNR~V
@echo ${COMPONENT}: export complete (libs)
@echo ${COMPONENT}: export complete (libs)
install: export_libs export_hdrs
@echo ${COMPONENT}: installed (exported)
......@@ -185,24 +185,22 @@ o.local_dirs:
${MKDIR} o
${MKDIR} z
Create o.local_dirs
o.dirs: o.local_dirs
${MKDIR} ${LIBDIR}
${MKDIR} ${LIBDIR}.ImageLib
${MKDIR} ${LIBDIR}.ImageLib.h
${MKDIR} ${LIBDIR}.ImageLib.o
Create o.dirs
${MKDIR} ${LIBDIR}.ImageLib.h
${MKDIR} ${LIBDIR}.ImageLib.o
Create o.dirs
#
# Final link
#
${TARGET}: ${OBJS} o.local_dirs
${LB} ${LBFLAGS} -o o.${COMPONENT} ${OBJS}
${LB} ${LBFLAGS} -o o.${COMPONENT} ${OBJS}
${TARGETZ}: ${OBJSZ} o.local_dirs
${LB} ${LBFLAGS} -o o.${COMPONENTZ} ${OBJSZ}
${EXP_HDR}.${COMPONENT}: hdr.${COMPONENT}
${CP} hdr.${COMPONENT} $@ ${CPFLAGS}
${CP} hdr.${COMPONENT} $@ ${CPFLAGS}
# Dynamic dependencies:
......@@ -28,8 +28,8 @@ Squeezeflags = -o $@
# Final targets:
@.Test: @.o.test C:o.stubs <Lib$Dir>.ImageLib.o.ImageLib tbox:o.flexlib \
<Lib$Dir>.ImageLib.o.libpng-lib <Lib$Dir>.zlib.o.zlib tbox:o.eventlib tbox:o.toolboxlib tbox:o.wimplib
Link $(Linkflags) @.o.test C:o.stubs <Lib$Dir>.ImageLib.o.ImageLib \
tbox:o.flexlib <Lib$Dir>.ImageLib.o.libpng-lib <Lib$Dir>.ImageLib.o.libjpeg <Lib$Dir>.zlib.o.zlib \
Link $(Linkflags) @.o.test <Lib$Dir>.ImageLib.o.ImageLib \
tbox:o.flexlib <Lib$Dir>.ImageLib.o.libpng-lib <Lib$Dir>.ImageLib.o.libjpeg <Lib$Dir>.zlib.o.zlib C:o.stubs \
tbox:o.eventlib tbox:o.toolboxlib tbox:o.renderlib tbox:o.wimplib
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment