Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -86,5 +86,5 @@ .PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(BUILDS) $(CLEANS) clean -all: ../Makefile.config ../config.h ../config.defs $(BUILDS) +all: $(BUILDS) clean: $(CLEANS) Index: uspace/app/bdsh/Makefile =================================================================== --- uspace/app/bdsh/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/app/bdsh/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,139 +1,40 @@ -# Copyright (c) 2005, Martin Decky -# All rights reserved. -# Copyright (c) 2008, Tim Post +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # # Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: +# modification, are permitted provided that the following conditions +# are met: # -# Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. # -# Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Neither the name of the original program's authors nor the names of its -# contributors may be used to endorse or promote products derived from this -# software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -include ../../../version +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint -LIBBLOCK_PREFIX = ../../lib/libblock +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -I../../srv/kbd/include -I$(LIBBLOCK_PREFIX) - -LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a -DEFS += -DRELEASE=$(RELEASE) - -PROGRAM = bdsh - -# Any directory that cleaning targets should know about -SUBDIRS = \ - ./ \ - cmds/ \ - cmds/modules/ \ - cmds/modules/help/ \ - cmds/modules/mkdir/ \ - cmds/modules/rm/ \ - cmds/modules/bdd/ \ - cmds/modules/cat/ \ - cmds/modules/touch/ \ - cmds/modules/ls/ \ - cmds/modules/pwd/ \ - cmds/modules/sleep/ \ - cmds/modules/cp/ \ - cmds/modules/mv/ \ - cmds/modules/mount/ \ - cmds/modules/kcon/ \ - cmds/builtins/ \ - cmds/builtins/exit/\ - cmds/builtins/cd/ - -SOURCES = \ - cmds/modules/help/help.c \ - cmds/modules/mkdir/mkdir.c \ - cmds/modules/rm/rm.c \ - cmds/modules/bdd/bdd.c \ - cmds/modules/cat/cat.c \ - cmds/modules/touch/touch.c \ - cmds/modules/ls/ls.c \ - cmds/modules/pwd/pwd.c \ - cmds/modules/sleep/sleep.c \ - cmds/modules/cp/cp.c \ - cmds/modules/mv/mv.c \ - cmds/modules/mount/mount.c \ - cmds/modules/kcon/kcon.c \ - cmds/builtins/exit/exit.c \ - cmds/builtins/cd/cd.c \ - cmds/mod_cmds.c \ - cmds/builtin_cmds.c \ - errors.c \ - input.c \ - util.c \ - exec.c \ - scli.c - -CFLAGS += -I. -Icmds/ -Icmds/builtins -Icmds/modules - -OBJECTS = $(SOURCES:.c=.o) - -# For easy cleaning, *.o is already handled -CLEANDIRS := $(addsuffix *~,$(SUBDIRS)) -CLEANDIRS += $(addsuffix *.bak,$(SUBDIRS)) -CLEANDIRS += $(addsuffix *.tmp,$(SUBDIRS)) -CLEANDIRS += $(addsuffix *.out,$(SUBDIRS)) -CLEANDIRS += $(addsuffix *.d,$(SUBDIRS)) -CLEANDIRS += $(addsuffix *.gch,$(SUBDIRS) ) - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(CFLAGS) $(INC) -c $< -o $@ - @$(CC) -M $(CFLAGS) $(INC) $*.c > $*.d - -$(PROGRAM): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(PROGRAM).map - -# Everything else is a phony target -.PHONY: all clean distclean depend - -all: $(PROGRAM) $(PROGRAM).disasm +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - @-rm -f $(OBJECTS) - @-rm -f $(PROGRAM) - @-rm -f $(PROGRAM).map - @-rm -f $(PROGRAM).disasm - @-rm -f $(CLEANDIRS) - -depend: - @echo '' - -$(PROGRAM).disasm: $(PROGRAM) - $(OBJDUMP) -d $< > $@ - -distclean: clean - -# Do not delete - dependencies --include $(OBJECTS:.o=.d) + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/app/bdsh/Makefile.build =================================================================== --- uspace/app/bdsh/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/bdsh/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,84 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +CFLAGS += -I$(LIBBLOCK_PREFIX) -I. -Icmds/ -Icmds/builtins -Icmds/modules + +## Sources +# + +SOURCES = \ + cmds/modules/help/help.c \ + cmds/modules/mkdir/mkdir.c \ + cmds/modules/rm/rm.c \ + cmds/modules/bdd/bdd.c \ + cmds/modules/cat/cat.c \ + cmds/modules/touch/touch.c \ + cmds/modules/ls/ls.c \ + cmds/modules/pwd/pwd.c \ + cmds/modules/sleep/sleep.c \ + cmds/modules/cp/cp.c \ + cmds/modules/mv/mv.c \ + cmds/modules/mount/mount.c \ + cmds/modules/kcon/kcon.c \ + cmds/builtins/exit/exit.c \ + cmds/builtins/cd/cd.c \ + cmds/mod_cmds.c \ + cmds/builtin_cmds.c \ + errors.c \ + input.c \ + util.c \ + exec.c \ + scli.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/app/bdsh/Makefile.common =================================================================== --- uspace/app/bdsh/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/bdsh/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,40 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBBLOCK_PREFIX = ../../lib/libblock +LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = bdsh Index: uspace/app/edit/Makefile =================================================================== --- uspace/app/edit/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/app/edit/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,49 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -I../../.. -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = edit -SOURCES = \ - edit.c \ - sheet.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/app/edit/Makefile.build =================================================================== --- uspace/app/edit/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/edit/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,62 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + edit.c \ + sheet.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/app/edit/Makefile.common =================================================================== --- uspace/app/edit/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/edit/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = edit Index: uspace/app/getvc/Makefile =================================================================== --- uspace/app/getvc/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/app/getvc/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # -# Copyright (c) 2009 Martin Decky +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,51 +28,13 @@ # -include ../../../version +include Makefile.common -## Setup toolchain -# +.PHONY: all clean -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint - -include $(LIBC_PREFIX)/Makefile.toolchain - -LIBS = $(LIBC_PREFIX)/libc.a -DEFS += -DRELEASE=$(RELEASE) "-DNAME=$(NAME)" - -## Sources -# - -OUTPUT = getvc -SOURCES = \ - getvc.c \ - version.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../version $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/app/getvc/Makefile.build =================================================================== --- uspace/app/getvc/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/getvc/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,65 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain +include ../../../version + +DEFS += -DRELEASE=$(RELEASE) "-DNAME=$(NAME)" + +## Sources +# + +SOURCES = \ + getvc.c \ + version.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/app/getvc/Makefile.common =================================================================== --- uspace/app/getvc/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/getvc/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = getvc Index: uspace/app/init/Makefile =================================================================== --- uspace/app/init/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/app/init/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,48 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -I../../.. -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = init -SOURCES = \ - init.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/app/init/Makefile.build =================================================================== --- uspace/app/init/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/init/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,61 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + init.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/app/init/Makefile.common =================================================================== --- uspace/app/init/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/init/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = init Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/app/init/init.c (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -48,5 +48,4 @@ #include #include -#include #include "init.h" Index: uspace/app/klog/Makefile =================================================================== --- uspace/app/klog/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/app/klog/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,48 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = klog -SOURCES = \ - klog.c - - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/app/klog/Makefile.build =================================================================== --- uspace/app/klog/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/klog/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,61 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + klog.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/app/klog/Makefile.common =================================================================== --- uspace/app/klog/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/klog/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = klog Index: uspace/app/tester/Makefile =================================================================== --- uspace/app/tester/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/app/tester/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,64 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -I../../srv/kbd/include - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = tester -SOURCES = tester.c \ - thread/thread1.c \ - print/print1.c \ - print/print2.c \ - print/print3.c \ - print/print4.c \ - console/console1.c \ - stdio/stdio1.c \ - stdio/stdio2.c \ - fault/fault1.c \ - fault/fault2.c \ - vfs/vfs1.c \ - ipc/ping_pong.c \ - ipc/register.c \ - ipc/connect.c \ - loop/loop1.c \ - mm/malloc1.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend disasm - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/app/tester/Makefile.build =================================================================== --- uspace/app/tester/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/tester/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,77 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + tester.c \ + thread/thread1.c \ + print/print1.c \ + print/print2.c \ + print/print3.c \ + print/print4.c \ + console/console1.c \ + stdio/stdio1.c \ + stdio/stdio2.c \ + fault/fault1.c \ + fault/fault2.c \ + vfs/vfs1.c \ + ipc/ping_pong.c \ + ipc/register.c \ + ipc/connect.c \ + loop/loop1.c \ + mm/malloc1.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/app/tester/Makefile.common =================================================================== --- uspace/app/tester/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/tester/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = tester Index: uspace/app/tetris/Makefile =================================================================== --- uspace/app/tetris/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/app/tetris/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,37 +1,40 @@ -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# -include $(LIBC_PREFIX)/Makefile.toolchain +include Makefile.common -LIBS = $(LIBC_PREFIX)/libc.a +.PHONY: all clean -OUTPUT = tetris -SOURCES = shapes.c scores.c input.c tetris.c screen.c -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend *.o - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/app/tetris/Makefile.build =================================================================== --- uspace/app/tetris/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/tetris/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,65 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + shapes.c \ + scores.c \ + input.c \ + tetris.c \ + screen.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/app/tetris/Makefile.common =================================================================== --- uspace/app/tetris/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/tetris/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = tetris Index: uspace/app/trace/Makefile =================================================================== --- uspace/app/trace/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/app/trace/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,53 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -I../../srv/kbd/include - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = trace -SOURCES = trace.c \ - syscalls.c \ - ipcp.c \ - ipc_desc.c \ - proto.c \ - errors.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/app/trace/Makefile.build =================================================================== --- uspace/app/trace/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/trace/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,66 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + trace.c \ + syscalls.c \ + ipcp.c \ + ipc_desc.c \ + proto.c \ + errors.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/app/trace/Makefile.common =================================================================== --- uspace/app/trace/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/app/trace/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = trace Index: uspace/lib/libblock/Makefile =================================================================== --- uspace/lib/libblock/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/lib/libblock/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -28,40 +28,13 @@ # -## Common compiler flags -# +include Makefile.common -LIBC_PREFIX = ../libc +.PHONY: all clean -## Setup toolchain -# - -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -Iinclude - -## Sources -# - -SOURCES = \ - libblock.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: libblock.a - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f libblock.a Makefile.depend + rm -f $(DEPEND) $(DEPEND_PREV) $(LIBBLOCK) find . -name '*.o' -follow -exec rm \{\} \; - -depend: - -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null - -libblock.a: depend $(OBJECTS) - $(AR) rc libblock.a $(OBJECTS) - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ Index: uspace/lib/libblock/Makefile.build =================================================================== --- uspace/lib/libblock/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/lib/libblock/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,58 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + libblock.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(LIBBLOCK) + +-include $(DEPEND) + +$(LIBBLOCK): $(OBJECTS) + $(AR) rc $@ $(OBJECTS) + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/lib/libblock/Makefile.common =================================================================== --- uspace/lib/libblock/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/lib/libblock/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,36 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../libc +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +LIBBLOCK = libblock.a Index: uspace/lib/libc/Makefile =================================================================== --- uspace/lib/libc/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/lib/libc/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -27,101 +27,13 @@ # -## Common compiler flags -# +include Makefile.common -LIBC_PREFIX = $(shell pwd) -SOFTINT_PREFIX = ../softint +.PHONY: all clean - -## Setup toolchain -# - -include $(LIBC_PREFIX)/Makefile.toolchain - - -## Sources -# - -GENERIC_SOURCES = \ - generic/libc.c \ - generic/ddi.c \ - generic/as.c \ - generic/cap.c \ - generic/devmap.c \ - generic/event.c \ - generic/errno.c \ - generic/mem.c \ - generic/string.c \ - generic/fibril.c \ - generic/fibril_sync.c \ - generic/pcb.c \ - generic/smc.c \ - generic/thread.c \ - generic/tls.c \ - generic/task.c \ - generic/futex.c \ - generic/io/asprintf.c \ - generic/io/io.c \ - generic/io/printf.c \ - generic/io/klog.c \ - generic/io/snprintf.c \ - generic/io/vprintf.c \ - generic/io/vsnprintf.c \ - generic/io/printf_core.c \ - generic/io/console.c \ - generic/malloc.c \ - generic/sysinfo.c \ - generic/ipc.c \ - generic/async.c \ - generic/loader.c \ - generic/getopt.c \ - generic/adt/list.o \ - generic/adt/hash_table.o \ - generic/time.c \ - generic/err.c \ - generic/stdlib.c \ - generic/mman.c \ - generic/udebug.c \ - generic/vfs/vfs.c \ - generic/vfs/canonify.c - -ARCH_SOURCES += \ - arch/$(UARCH)/src/entry.s \ - arch/$(UARCH)/src/thread_entry.s - -GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) -ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES))) -OBJECTS := $(GENERIC_OBJECTS) $(ARCH_OBJECTS) - -.PHONY: all clean depend kerninc - -all: libc.a - --include Makefile.depend +all: ../../../Makefile.config ../../../config.h ../../../config.defs + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f include/kernel include/arch include/libarch libc.a arch/$(UARCH)/_link.ld Makefile.depend - find generic/ arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \; - -depend: kerninc arch/$(UARCH)/_link.ld - -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null - -libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS) - $(AR) rc libc.a $(LIBS) $(ARCH_OBJECTS) $(GENERIC_OBJECTS) - -kerninc: - ln -sfn ../../../../kernel/generic/include include/kernel - ln -sfn kernel/arch include/arch - ln -sfn ../arch/$(UARCH)/include include/libarch - -arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in - $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(LIBC) arch/*/_link.ld + find generic/ arch/*/ -name '*.o' -follow -exec rm \{\} \; Index: uspace/lib/libc/Makefile.build =================================================================== --- uspace/lib/libc/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/lib/libc/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,132 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Common compiler flags +# + +LIBC_PREFIX = $(shell pwd) +SOFTINT_PREFIX = ../softint +LINK = arch/$(UARCH)/_link.ld + + +## Setup toolchain +# + +include Makefile.common +include Makefile.toolchain + + +## Sources +# + +GENERIC_SOURCES = \ + generic/libc.c \ + generic/ddi.c \ + generic/as.c \ + generic/cap.c \ + generic/devmap.c \ + generic/event.c \ + generic/errno.c \ + generic/mem.c \ + generic/string.c \ + generic/fibril.c \ + generic/fibril_sync.c \ + generic/pcb.c \ + generic/smc.c \ + generic/thread.c \ + generic/tls.c \ + generic/task.c \ + generic/futex.c \ + generic/io/asprintf.c \ + generic/io/io.c \ + generic/io/printf.c \ + generic/io/klog.c \ + generic/io/snprintf.c \ + generic/io/vprintf.c \ + generic/io/vsnprintf.c \ + generic/io/printf_core.c \ + generic/io/console.c \ + generic/malloc.c \ + generic/sysinfo.c \ + generic/ipc.c \ + generic/async.c \ + generic/loader.c \ + generic/getopt.c \ + generic/adt/list.o \ + generic/adt/hash_table.o \ + generic/time.c \ + generic/err.c \ + generic/stdlib.c \ + generic/mman.c \ + generic/udebug.c \ + generic/vfs/vfs.c \ + generic/vfs/canonify.c + +ARCH_SOURCES += \ + arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/thread_entry.s + +GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) +ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES))) +OBJECTS := $(GENERIC_OBJECTS) $(ARCH_OBJECTS) + +.PHONY: all + +all: $(LIBC) $(LINK) + +-include $(DEPEND) + +$(LIBC): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) + $(AR) rc $@ $(ARCH_OBJECTS) $(GENERIC_OBJECTS) + +$(LINK): $(LINK).in + $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@ + +%.o: %.S $(DEPEND) + $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ + +%.o: %.s $(DEPEND) + $(AS) $(AFLAGS) $< -o $@ + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ + +$(INCLUDE_ARCH): $(INCLUDE_KERNEL) $(INCLUDE_KERNEL)/arch + ln -sfn kernel/arch $@ + +$(INCLUDE_LIBARCH): arch/$(UARCH)/include + ln -sfn ../$< $@ + +$(INCLUDE_KERNEL)/arch: ../../../kernel/generic/include/arch $(INCLUDE_KERNEL) + +$(INCLUDE_KERNEL): ../../../kernel/generic/include/ + ln -sfn ../$< $@ Index: uspace/lib/libc/Makefile.common =================================================================== --- uspace/lib/libc/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/lib/libc/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,38 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +LIBC = libc.a +INCLUDE_KERNEL = include/kernel +INCLUDE_ARCH = include/arch +INCLUDE_LIBARCH = include/libarch Index: uspace/lib/libc/Makefile.toolchain =================================================================== --- uspace/lib/libc/Makefile.toolchain (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/lib/libc/Makefile.toolchain (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -59,7 +59,7 @@ # --include $(LIBC_PREFIX)/../../../Makefile.config --include $(LIBC_PREFIX)/../../../config.defs --include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc +include $(LIBC_PREFIX)/../../../Makefile.config +include $(LIBC_PREFIX)/../../../config.defs +include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc ## Simple detection of the host system Index: uspace/lib/libfs/Makefile =================================================================== --- uspace/lib/libfs/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/lib/libfs/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -28,40 +28,13 @@ # -## Common compiler flags -# +include Makefile.common -LIBC_PREFIX = ../libc +.PHONY: all clean -## Setup toolchain -# - -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -Iinclude - -## Sources -# - -SOURCES = \ - libfs.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: libfs.a - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f libfs.a Makefile.depend + rm -f $(DEPEND) $(DEPEND_PREV) $(LIBFS) find . -name '*.o' -follow -exec rm \{\} \; - -depend: - -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null - -libfs.a: depend $(OBJECTS) - $(AR) rc libfs.a $(OBJECTS) - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ Index: uspace/lib/libfs/Makefile.build =================================================================== --- uspace/lib/libfs/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/lib/libfs/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,58 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + libfs.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(LIBFS) + +-include $(DEPEND) + +$(LIBFS): $(OBJECTS) + $(AR) rc $@ $(OBJECTS) + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/lib/libfs/Makefile.common =================================================================== --- uspace/lib/libfs/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/lib/libfs/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,36 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../libc +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +LIBFS = libfs.a Index: uspace/lib/softfloat/Makefile =================================================================== --- uspace/lib/softfloat/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/lib/softfloat/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,56 +28,13 @@ # -## Common compiler flags -# +include Makefile.common -LIBC_PREFIX = ../libc +.PHONY: all clean -## Setup toolchain -# - -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -Iinclude -Iarch/$(UARCH)/include/ - -## Sources -# - -GENERIC_SOURCES = \ - generic/add.c \ - generic/common.c \ - generic/comparison.c \ - generic/conversion.c \ - generic/div.c \ - generic/mul.c \ - generic/other.c \ - generic/softfloat.c \ - generic/sub.c - -ARCH_SOURCES = - -GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) - -.PHONY: all clean depend - -all: libsoftfloat.a - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f libsoftfloat.a Makefile.depend - find generic/ -name '*.o' -follow -exec rm \{\} \; - -depend: - -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null - -libsoftfloat.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS) - $(AR) rc libsoftfloat.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS) - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(LIBSOFTFLOAT) + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/lib/softfloat/Makefile.build =================================================================== --- uspace/lib/softfloat/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/lib/softfloat/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,68 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +CFLAGS += -Iinclude -Iarch/$(UARCH)/include/ + +## Sources +# + +SOURCES = \ + generic/add.c \ + generic/common.c \ + generic/comparison.c \ + generic/conversion.c \ + generic/div.c \ + generic/mul.c \ + generic/other.c \ + generic/softfloat.c \ + generic/sub.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(LIBSOFTFLOAT) + +-include $(DEPEND) + +$(LIBSOFTFLOAT): $(OBJECTS) + $(AR) rc $@ $(OBJECTS) + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/lib/softfloat/Makefile.common =================================================================== --- uspace/lib/softfloat/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/lib/softfloat/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,36 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../libc +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +LIBSOFTFLOAT = libsoftfloat.a Index: uspace/lib/softint/Makefile =================================================================== --- uspace/lib/softint/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/lib/softint/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,49 +28,13 @@ # -## Common compiler flags -# +include Makefile.common -LIBC_PREFIX = ../libc +.PHONY: all clean -## Setup toolchain -# - -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -Iinclude - -## Sources -# - -ARCH_SOURCES = - -GENERIC_SOURCES = \ - generic/division.c\ - generic/multiplication.c - -GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) - -.PHONY: all clean depend - -all: libsoftint.a - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f libsoftint.a Makefile.depend - find generic/ -name '*.o' -follow -exec rm \{\} \; - -depend: - -makedepend -f - -- $(DEPEMD_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null - -libsoftint.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS) - $(AR) rc libsoftint.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS) - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(LIBSOFTINT) + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/lib/softint/Makefile.build =================================================================== --- uspace/lib/softint/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/lib/softint/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,61 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +CFLAGS += -Iinclude + +## Sources +# + +SOURCES = \ + generic/division.c\ + generic/multiplication.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(LIBSOFTINT) + +-include $(DEPEND) + +$(LIBSOFTINT): $(OBJECTS) + $(AR) rc $@ $(OBJECTS) + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/lib/softint/Makefile.common =================================================================== --- uspace/lib/softint/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/lib/softint/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,36 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../libc +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +LIBSOFTINT = libsoftint.a Index: uspace/srv/bd/ata_bd/Makefile =================================================================== --- uspace/srv/bd/ata_bd/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/bd/ata_bd/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # -# Copyright (c) 2006 Martin Decky +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,48 +28,13 @@ # -## Setup toolchain -# +include Makefile.common +.PHONY: all clean -LIBC_PREFIX = ../../../lib/libc -SOFTINT_PREFIX = ../../../lib/softint - -include $(LIBC_PREFIX)/Makefile.toolchain - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = ata_bd -SOURCES = \ - ata_bd.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/bd/ata_bd/Makefile.build =================================================================== --- uspace/srv/bd/ata_bd/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/bd/ata_bd/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,61 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + ata_bd.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/bd/ata_bd/Makefile.common =================================================================== --- uspace/srv/bd/ata_bd/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/bd/ata_bd/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../../lib/libc +SOFTINT_PREFIX = ../../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = ata_bd Index: uspace/srv/bd/file_bd/Makefile =================================================================== --- uspace/srv/bd/file_bd/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/bd/file_bd/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # -# Copyright (c) 2006 Martin Decky +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,48 +28,13 @@ # -## Setup toolchain -# +include Makefile.common +.PHONY: all clean -LIBC_PREFIX = ../../../lib/libc -SOFTINT_PREFIX = ../../../lib/softint - -include $(LIBC_PREFIX)/Makefile.toolchain - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = file_bd -SOURCES = \ - file_bd.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/bd/file_bd/Makefile.build =================================================================== --- uspace/srv/bd/file_bd/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/bd/file_bd/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,61 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + file_bd.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/bd/file_bd/Makefile.common =================================================================== --- uspace/srv/bd/file_bd/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/bd/file_bd/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../../lib/libc +SOFTINT_PREFIX = ../../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = file_bd Index: uspace/srv/bd/gxe_bd/Makefile =================================================================== --- uspace/srv/bd/gxe_bd/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/bd/gxe_bd/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # -# Copyright (c) 2006 Martin Decky +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,48 +28,13 @@ # -## Setup toolchain -# +include Makefile.common +.PHONY: all clean -LIBC_PREFIX = ../../../lib/libc -SOFTINT_PREFIX = ../../../lib/softint - -include $(LIBC_PREFIX)/Makefile.toolchain - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = gxe_bd -SOURCES = \ - gxe_bd.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/bd/gxe_bd/Makefile.build =================================================================== --- uspace/srv/bd/gxe_bd/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/bd/gxe_bd/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,61 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + gxe_bd.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/bd/gxe_bd/Makefile.common =================================================================== --- uspace/srv/bd/gxe_bd/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/bd/gxe_bd/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../../lib/libc +SOFTINT_PREFIX = ../../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = gxe_bd Index: uspace/srv/bd/rd/Makefile =================================================================== --- uspace/srv/bd/rd/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/bd/rd/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # -# Copyright (c) 2006 Martin Decky +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,48 +28,13 @@ # -## Setup toolchain -# +include Makefile.common +.PHONY: all clean -LIBC_PREFIX = ../../../lib/libc -SOFTINT_PREFIX = ../../../lib/softint - -include $(LIBC_PREFIX)/Makefile.toolchain - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = rd -SOURCES = \ - rd.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/bd/rd/Makefile.build =================================================================== --- uspace/srv/bd/rd/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/bd/rd/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,61 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + rd.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/bd/rd/Makefile.common =================================================================== --- uspace/srv/bd/rd/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/bd/rd/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../../lib/libc +SOFTINT_PREFIX = ../../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = rd Index: uspace/srv/cir/fhc/Makefile =================================================================== --- uspace/srv/cir/fhc/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/cir/fhc/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # -# Copyright (c) 2006 Martin Decky +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,48 +28,13 @@ # -## Setup toolchain -# +include Makefile.common +.PHONY: all clean -LIBC_PREFIX = ../../../lib/libc -SOFTINT_PREFIX = ../../../lib/softint - -include $(LIBC_PREFIX)/Makefile.toolchain - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = fhc -SOURCES = \ - fhc.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/cir/fhc/Makefile.build =================================================================== --- uspace/srv/cir/fhc/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/cir/fhc/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,61 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + fhc.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/cir/fhc/Makefile.common =================================================================== --- uspace/srv/cir/fhc/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/cir/fhc/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../../lib/libc +SOFTINT_PREFIX = ../../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = fhc Index: uspace/srv/cir/obio/Makefile =================================================================== --- uspace/srv/cir/obio/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/cir/obio/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # -# Copyright (c) 2006 Martin Decky +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,48 +28,13 @@ # -## Setup toolchain -# +include Makefile.common +.PHONY: all clean -LIBC_PREFIX = ../../../lib/libc -SOFTINT_PREFIX = ../../../lib/softint - -include $(LIBC_PREFIX)/Makefile.toolchain - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = obio -SOURCES = \ - obio.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/cir/obio/Makefile.build =================================================================== --- uspace/srv/cir/obio/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/cir/obio/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,61 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + obio.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/cir/obio/Makefile.common =================================================================== --- uspace/srv/cir/obio/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/cir/obio/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../../lib/libc +SOFTINT_PREFIX = ../../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = obio Index: uspace/srv/console/Makefile =================================================================== --- uspace/srv/console/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/console/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,71 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -I. - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = console - -GENERIC_SOURCES = \ - console.c \ - screenbuffer.c \ - keybuffer.c \ - gcons.c - -IMAGES = \ - gfx/helenos.ppm \ - gfx/nameic.ppm \ - gfx/cons_selected.ppm \ - gfx/cons_idle.ppm \ - gfx/cons_has_data.ppm \ - gfx/cons_kernel.ppm \ - gfx/anim_1.ppm \ - gfx/anim_2.ppm \ - gfx/anim_3.ppm \ - gfx/anim_4.ppm - -GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) \ - $(addsuffix .o,$(basename $(IMAGES))) - -OBJECTS := $(GENERIC_OBJECTS) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ - -%.o: %.ppm - $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) $< $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/console/Makefile.build =================================================================== --- uspace/srv/console/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/console/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,79 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + console.c \ + screenbuffer.c \ + keybuffer.c \ + gcons.c + +IMAGES = \ + gfx/helenos.ppm \ + gfx/nameic.ppm \ + gfx/cons_selected.ppm \ + gfx/cons_idle.ppm \ + gfx/cons_has_data.ppm \ + gfx/cons_kernel.ppm \ + gfx/anim_1.ppm \ + gfx/anim_2.ppm \ + gfx/anim_3.ppm \ + gfx/anim_4.ppm + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) $(addsuffix .o,$(basename $(IMAGES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +%.o: %.ppm + $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) $< $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/console/Makefile.common =================================================================== --- uspace/srv/console/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/console/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = console Index: uspace/srv/console/console.c =================================================================== --- uspace/srv/console/console.c (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/console/console.c (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -40,5 +40,4 @@ #include #include -#include #include #include @@ -55,4 +54,5 @@ #include "console.h" #include "gcons.h" +#include "keybuffer.h" #include "screenbuffer.h" Index: uspace/srv/console/keybuffer.c =================================================================== --- uspace/srv/console/keybuffer.c (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/console/keybuffer.c (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -35,6 +35,6 @@ */ -#include #include +#include "keybuffer.h" atomic_t keybuffer_futex = FUTEX_INITIALIZER; Index: uspace/srv/console/screenbuffer.c =================================================================== --- uspace/srv/console/screenbuffer.c (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/console/screenbuffer.c (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -33,8 +33,8 @@ */ -#include #include #include #include +#include "screenbuffer.h" /** Store one character to screenbuffer. Index: uspace/srv/devmap/Makefile =================================================================== --- uspace/srv/devmap/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/devmap/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,49 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = devmap -SOURCES = \ - devmap.c - -CFLAGS += -D$(UARCH) - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/devmap/Makefile.build =================================================================== --- uspace/srv/devmap/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/devmap/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,61 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + devmap.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/devmap/Makefile.common =================================================================== --- uspace/srv/devmap/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/devmap/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = devmap Index: uspace/srv/fb/Makefile =================================================================== --- uspace/srv/fb/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/fb/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,87 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = fb -SOURCES = \ - main.c \ - ppm.c - -ifneq ($(UARCH),ia64) - SOURCES += fb.c \ - font-8x16.c - CFLAGS += -DFB_ENABLED -endif - -ifeq ($(UARCH),ia32) - SOURCES += ega.c - CFLAGS += -DEGA_ENABLED -endif - -ifeq ($(UARCH),ia64) - SOURCES += ega.c \ - ski.c \ - serial_console.c - CFLAGS += -DSKI_ENABLED - CFLAGS += -DEGA_ENABLED -endif - -ifeq ($(UARCH),amd64) - SOURCES += ega.c - CFLAGS += -DEGA_ENABLED -endif - -ifeq ($(UARCH),mips32) - SOURCES += msim.c \ - serial_console.c - CFLAGS += -DMSIM_ENABLED -endif - -ifeq ($(UARCH),sparc64) - SOURCES += sgcn.c \ - serial_console.c - CFLAGS += -DSGCN_ENABLED -endif - -CFLAGS += -D$(UARCH) - - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/fb/Makefile.build =================================================================== --- uspace/srv/fb/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/fb/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,100 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + main.c \ + ppm.c + +ifneq ($(UARCH),ia64) + SOURCES += fb.c \ + font-8x16.c + CFLAGS += -DFB_ENABLED +endif + +ifeq ($(UARCH),ia32) + SOURCES += ega.c + CFLAGS += -DEGA_ENABLED +endif + +ifeq ($(UARCH),ia64) + SOURCES += ega.c \ + ski.c \ + serial_console.c + CFLAGS += -DSKI_ENABLED + CFLAGS += -DEGA_ENABLED +endif + +ifeq ($(UARCH),amd64) + SOURCES += ega.c + CFLAGS += -DEGA_ENABLED +endif + +ifeq ($(UARCH),mips32) + SOURCES += msim.c \ + serial_console.c + CFLAGS += -DMSIM_ENABLED +endif + +ifeq ($(UARCH),sparc64) + SOURCES += sgcn.c \ + serial_console.c + CFLAGS += -DSGCN_ENABLED +endif + +CFLAGS += -D$(UARCH) + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/fb/Makefile.common =================================================================== --- uspace/srv/fb/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/fb/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = fb Index: uspace/srv/fs/devfs/Makefile =================================================================== --- uspace/srv/fs/devfs/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/fs/devfs/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,54 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../../lib/libc -LIBFS_PREFIX = ../../../lib/libfs -SOFTINT_PREFIX = ../../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -I $(LIBFS_PREFIX) - -LIBS = \ - $(LIBFS_PREFIX)/libfs.a \ - $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = devfs -SOURCES = \ - devfs.c \ - devfs_ops.c - - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/fs/devfs/Makefile.build =================================================================== --- uspace/srv/fs/devfs/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/fs/devfs/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,64 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +CFLAGS += -I$(LIBFS_PREFIX) + +## Sources +# + +SOURCES = \ + devfs.c \ + devfs_ops.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/fs/devfs/Makefile.common =================================================================== --- uspace/srv/fs/devfs/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/fs/devfs/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,40 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../../lib/libc +LIBFS_PREFIX = ../../../lib/libfs +SOFTINT_PREFIX = ../../../lib/softint +LIBS = $(LIBFS_PREFIX)/libfs.a $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = devfs Index: uspace/srv/fs/fat/Makefile =================================================================== --- uspace/srv/fs/fat/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/fs/fat/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # -# Copyright (c) 2006 Martin Decky +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,58 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../../lib/libc -LIBFS_PREFIX = ../../../lib/libfs -LIBBLOCK_PREFIX = ../../../lib/libblock -SOFTINT_PREFIX = ../../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -I $(LIBFS_PREFIX) -I $(LIBBLOCK_PREFIX) - -LIBS = \ - $(LIBFS_PREFIX)/libfs.a \ - $(LIBBLOCK_PREFIX)/libblock.a \ - $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = fat -SOURCES = \ - fat.c \ - fat_ops.c \ - fat_idx.c \ - fat_dentry.c \ - fat_fat.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/fs/fat/Makefile.build =================================================================== --- uspace/srv/fs/fat/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/fs/fat/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,67 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +CFLAGS += -I$(LIBFS_PREFIX) -I$(LIBBLOCK_PREFIX) + +## Sources +# + +SOURCES = \ + fat.c \ + fat_ops.c \ + fat_idx.c \ + fat_dentry.c \ + fat_fat.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/fs/fat/Makefile.common =================================================================== --- uspace/srv/fs/fat/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/fs/fat/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,41 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../../lib/libc +LIBFS_PREFIX = ../../../lib/libfs +LIBBLOCK_PREFIX = ../../../lib/libblock +SOFTINT_PREFIX = ../../../lib/softint +LIBS = $(LIBFS_PREFIX)/libfs.a $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = fat Index: uspace/srv/fs/tmpfs/Makefile =================================================================== --- uspace/srv/fs/tmpfs/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/fs/tmpfs/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # -# Copyright (c) 2006 Martin Decky +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,56 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../../lib/libc -LIBFS_PREFIX = ../../../lib/libfs -LIBBLOCK_PREFIX = ../../../lib/libblock -SOFTINT_PREFIX = ../../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -I $(LIBFS_PREFIX) -I $(LIBBLOCK_PREFIX) - -LIBS = \ - $(LIBFS_PREFIX)/libfs.a \ - $(LIBBLOCK_PREFIX)/libblock.a \ - $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = tmpfs -SOURCES = \ - tmpfs.c \ - tmpfs_ops.c \ - tmpfs_dump.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/fs/tmpfs/Makefile.build =================================================================== --- uspace/srv/fs/tmpfs/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/fs/tmpfs/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,65 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +CFLAGS += -I$(LIBFS_PREFIX) -I$(LIBBLOCK_PREFIX) + +## Sources +# + +SOURCES = \ + tmpfs.c \ + tmpfs_ops.c \ + tmpfs_dump.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/fs/tmpfs/Makefile.common =================================================================== --- uspace/srv/fs/tmpfs/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/fs/tmpfs/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,41 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../../lib/libc +LIBFS_PREFIX = ../../../lib/libfs +LIBBLOCK_PREFIX = ../../../lib/libblock +SOFTINT_PREFIX = ../../../lib/softint +LIBS = $(LIBFS_PREFIX)/libfs.a $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = tmpfs Index: uspace/srv/kbd/Makefile =================================================================== --- uspace/srv/kbd/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/kbd/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,157 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -Iinclude - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = kbd -GENERIC_SOURCES = \ - generic/kbd.c \ - genarch/gsp.c \ - genarch/stroke.c - -ARCH_SOURCES = -GENARCH_SOURCES = \ - layout/cz.c \ - layout/us_qwerty.c \ - layout/us_dvorak.c - -ifeq ($(UARCH), amd64) - GENARCH_SOURCES += \ - port/i8042.c \ - ctl/pc.c -endif - -ifeq ($(UARCH), arm32) -ifeq ($(MACHINE), testarm) - GENARCH_SOURCES += \ - port/gxemul.c - - ifeq ($(CONFIG_FB), y) - GENARCH_SOURCES += \ - ctl/gxe_fb.c - else - GENARCH_SOURCES += \ - ctl/stty.c - endif -endif -ifeq ($(MACHINE), integratorcp) - GENARCH_SOURCES += \ - port/pl050.c \ - ctl/pl050.c -endif -endif - -ifeq ($(UARCH), ia32) - GENARCH_SOURCES += \ - port/i8042.c \ - ctl/pc.c -endif - -ifeq ($(MACHINE), i460GX) - GENARCH_SOURCES += \ - port/i8042.c \ - ctl/pc.c -endif - -ifeq ($(MACHINE), ski) - GENARCH_SOURCES += \ - port/ski.c \ - ctl/stty.c -endif - -ifeq ($(MACHINE), msim) - GENARCH_SOURCES += \ - port/msim.c \ - ctl/stty.c -endif - -ifeq ($(MACHINE), lgxemul) - GENARCH_SOURCES += \ - port/gxemul.c - - ifeq ($(CONFIG_FB), y) - GENARCH_SOURCES += \ - ctl/gxe_fb.c - else - GENARCH_SOURCES += \ - ctl/stty.c - endif -endif - -ifeq ($(MACHINE), bgxemul) - GENARCH_SOURCES += \ - port/gxemul.c - - ifeq ($(CONFIG_FB), y) - GENARCH_SOURCES += \ - ctl/gxe_fb.c - else - GENARCH_SOURCES += \ - ctl/stty.c - endif -endif - -ifeq ($(UARCH), ppc32) - GENARCH_SOURCES += \ - port/dummy.c \ - ctl/stty.c -endif - -ifeq ($(UARCH), sparc64) - ifeq ($(MACHINE),serengeti) - GENARCH_SOURCES += \ - port/sgcn.c \ - ctl/stty.c - else - GENARCH_SOURCES += \ - port/sun.c \ - port/z8530.c \ - port/ns16550.c \ - ctl/sun.c - endif -endif - -GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) -ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES))) -GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES))) - -OBJECTS := $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(GENARCH_OBJECTS) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/kbd/Makefile.build =================================================================== --- uspace/srv/kbd/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/kbd/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,164 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +CFLAGS += -Iinclude + +## Sources +# + +SOURCES = \ + generic/kbd.c \ + genarch/gsp.c \ + genarch/stroke.c \ + layout/cz.c \ + layout/us_qwerty.c \ + layout/us_dvorak.c + +ifeq ($(UARCH),amd64) + SOURCES += \ + port/i8042.c \ + ctl/pc.c +endif + +ifeq ($(UARCH),arm32) + ifeq ($(MACHINE),testarm) + SOURCES += \ + port/gxemul.c + + ifeq ($(CONFIG_FB),y) + SOURCES += \ + ctl/gxe_fb.c + else + SOURCES += \ + ctl/stty.c + endif + endif + ifeq ($(MACHINE),integratorcp) + SOURCES += \ + port/pl050.c \ + ctl/pl050.c + endif +endif + +ifeq ($(UARCH),ia32) + SOURCES += \ + port/i8042.c \ + ctl/pc.c +endif + +ifeq ($(MACHINE),i460GX) + SOURCES += \ + port/i8042.c \ + ctl/pc.c +endif + +ifeq ($(MACHINE),ski) + SOURCES += \ + port/ski.c \ + ctl/stty.c +endif + +ifeq ($(MACHINE),msim) + SOURCES += \ + port/msim.c \ + ctl/stty.c +endif + +ifeq ($(MACHINE),lgxemul) + SOURCES += \ + port/gxemul.c + + ifeq ($(CONFIG_FB),y) + SOURCES += \ + ctl/gxe_fb.c + else + SOURCES += \ + ctl/stty.c + endif +endif + +ifeq ($(MACHINE),bgxemul) + SOURCES += \ + port/gxemul.c + + ifeq ($(CONFIG_FB),y) + SOURCES += \ + ctl/gxe_fb.c + else + SOURCES += \ + ctl/stty.c + endif +endif + +ifeq ($(UARCH),ppc32) + SOURCES += \ + port/dummy.c \ + ctl/stty.c +endif + +ifeq ($(UARCH),sparc64) + ifeq ($(MACHINE),serengeti) + SOURCES += \ + port/sgcn.c \ + ctl/stty.c + else + SOURCES += \ + port/sun.c \ + port/z8530.c \ + port/ns16550.c \ + ctl/sun.c + endif +endif + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/kbd/Makefile.common =================================================================== --- uspace/srv/kbd/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/kbd/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = kbd Index: uspace/srv/loader/Makefile =================================================================== --- uspace/srv/loader/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/loader/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,5 +1,5 @@ # # Copyright (c) 2005 Martin Decky -# Copyright (c) 2008 Jiri Svoboda +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -28,56 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain -include arch/$(UARCH)/Makefile.inc - -CFLAGS += -Iinclude - -LIBS = $(LIBC_PREFIX)/libc.a $(SOFTINT_PREFIX)/libsoftint.a - -## Sources -# - -OUTPUT = loader -GENERIC_SOURCES = \ - main.c \ - elf_load.c \ - interp.s - -SOURCES := $(GENERIC_SOURCES) $(ARCH_SOURCES) -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm arch/$(UARCH)/_link.ld Makefile.depend - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) arch/$(UARCH)/_link.ld - $(LD) -T arch/$(UARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in - $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm arch/*/_link.ld + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/loader/Makefile.build =================================================================== --- uspace/srv/loader/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/loader/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,74 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain +include arch/$(UARCH)/Makefile.inc + +CFLAGS += -Iinclude +LINK = arch/$(UARCH)/_link.ld + +## Sources +# + +GENERIC_SOURCES = \ + main.c \ + elf_load.c \ + interp.s + +SOURCES := $(GENERIC_SOURCES) $(ARCH_SOURCES) +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) $(LINK) + $(LD) -T $(LINK) $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map + +$(LINK): $(LINK).in + $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@ + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +%.o: %.s $(DEPEND) + $(AS) $(AFLAGS) $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/loader/Makefile.common =================================================================== --- uspace/srv/loader/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/loader/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a $(SOFTINT_PREFIX)/libsoftint.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = loader Index: uspace/srv/ns/Makefile =================================================================== --- uspace/srv/ns/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/ns/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,50 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = ns -SOURCES = \ - ns.c \ - service.c \ - clonable.c \ - task.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/ns/Makefile.build =================================================================== --- uspace/srv/ns/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/ns/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,64 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + ns.c \ + service.c \ + clonable.c \ + task.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/ns/Makefile.common =================================================================== --- uspace/srv/ns/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/ns/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = ns Index: uspace/srv/part/mbr_part/Makefile =================================================================== --- uspace/srv/part/mbr_part/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/part/mbr_part/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # -# Copyright (c) 2006 Martin Decky +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,50 +28,13 @@ # -## Setup toolchain -# +include Makefile.common +.PHONY: all clean -LIBC_PREFIX = ../../../lib/libc -SOFTINT_PREFIX = ../../../lib/softint -LIBBLOCK_PREFIX = ../../../lib/libblock - -include $(LIBC_PREFIX)/Makefile.toolchain - -CFLAGS += -I$(LIBBLOCK_PREFIX) -LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = mbr_part -SOURCES = \ - mbr_part.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/part/mbr_part/Makefile.build =================================================================== --- uspace/srv/part/mbr_part/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/part/mbr_part/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,63 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +CFLAGS += -I$(LIBBLOCK_PREFIX) + +## Sources +# + +SOURCES = \ + mbr_part.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/part/mbr_part/Makefile.common =================================================================== --- uspace/srv/part/mbr_part/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/part/mbr_part/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,40 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../../lib/libc +SOFTINT_PREFIX = ../../../lib/softint +LIBBLOCK_PREFIX = ../../../lib/libblock +LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = mbr_part Index: uspace/srv/pci/Makefile =================================================================== --- uspace/srv/pci/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/pci/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,4 +1,5 @@ # # Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -27,53 +28,17 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build - -LIBS = libpci/libpci.a $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = pci -SOURCES = \ - pci.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +$(LIBPCI): + $(MAKE) -C libpci clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) $(MAKE) -C libpci clean - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(MAKE) -C libpci - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ - -libpci/libpci.a: - $(MAKE) -C libpci + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/pci/Makefile.build =================================================================== --- uspace/srv/pci/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/pci/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,61 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + pci.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/pci/Makefile.common =================================================================== --- uspace/srv/pci/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/pci/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,40 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBPCI = libpci/libpci.a +LIBS = $(LIBPCI) $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = pci Index: uspace/srv/pci/libpci/Makefile =================================================================== --- uspace/srv/pci/libpci/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/pci/libpci/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,29 +1,40 @@ -# Makefile for The PCI Library -# (c) 1999 Martin Mares +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# -# Modified and ported to HelenOS by Jakub Jermar +include Makefile.common -LIBC_PREFIX=$(shell cd ../../../lib/libc; pwd) +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -LIBS = $(LIBC_PREFIX)/libc.a -CFLAGS += -I$(LIBC_PREFIX)/include -trigraphs - -OBJS=access.o generic.o names.o -INCL=internal.h pci.h header.h sysdep.h types.h pci_ids.h - -PCILIB=libpci.a - -OBJS += i386-ports.o - -all: $(PCILIB) - -$(PCILIB): $(OBJS) - $(AR) rc $@ $(OBJS) - -%.o: %.c $(INCL) - $(CC) $(CFLAGS) -c $< -o $@ +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm *.o libpci.a + rm -f $(DEPEND) $(DEPEND_PREV) $(LIBPCI) + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/pci/libpci/Makefile.build =================================================================== --- uspace/srv/pci/libpci/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/pci/libpci/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,61 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + access.c \ + generic.c \ + names.c \ + i386-ports.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(LIBPCI) + +-include $(DEPEND) + +$(LIBPCI): $(OBJECTS) + $(AR) rc $@ $(OBJECTS) + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/pci/libpci/Makefile.common =================================================================== --- uspace/srv/pci/libpci/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/pci/libpci/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,36 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../../lib/libc +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +LIBPCI = libpci.a Index: uspace/srv/vfs/Makefile =================================================================== --- uspace/srv/vfs/Makefile (revision 00413c5c7dfd26adbc32dc9cc467868315f9c621) +++ uspace/srv/vfs/Makefile (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -1,5 +1,5 @@ # -# Copyright (c) 2006 Martin Decky -# Copyright (c) 2008 Jakub Jermar +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar # All rights reserved. # @@ -28,52 +28,13 @@ # -## Setup toolchain -# +include Makefile.common -LIBC_PREFIX = ../../lib/libc -SOFTINT_PREFIX = ../../lib/softint +.PHONY: all clean -include $(LIBC_PREFIX)/Makefile.toolchain - -LIBS = $(LIBC_PREFIX)/libc.a - -## Sources -# - -OUTPUT = vfs -SOURCES = \ - vfs.c \ - vfs_node.c \ - vfs_file.c \ - vfs_ops.c \ - vfs_lookup.c \ - vfs_register.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all clean depend - -all: $(OUTPUT) $(OUTPUT).disasm - --include Makefile.depend +all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS) + -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV) + $(MAKE) -f Makefile.build clean: - -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS) - -depend: - $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend - -$(OUTPUT): $(OBJECTS) $(LIBS) - $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map - -$(OUTPUT).disasm: $(OUTPUT) - $(OBJDUMP) -d $< > $@ - -%.o: %.S - $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ - -%.o: %.s - $(AS) $(AFLAGS) $< -o $@ - -%.o: %.c - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm + find . -name '*.o' -follow -exec rm \{\} \; Index: uspace/srv/vfs/Makefile.build =================================================================== --- uspace/srv/vfs/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/vfs/Makefile.build (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,66 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Setup toolchain +# + +include Makefile.common +include $(LIBC_PREFIX)/Makefile.toolchain + +## Sources +# + +SOURCES = \ + vfs.c \ + vfs_node.c \ + vfs_file.c \ + vfs_ops.c \ + vfs_lookup.c \ + vfs_register.c + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +.PHONY: all + +all: $(OUTPUT) $(OUTPUT).disasm + +-include $(DEPEND) + +$(OUTPUT).disasm: $(OUTPUT) + $(OBJDUMP) -d $< > $@ + +$(OUTPUT): $(OBJECTS) $(LIBS) + $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map + +%.o: %.c $(DEPEND) + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ + +$(DEPEND): + makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null + -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/srv/vfs/Makefile.common =================================================================== --- uspace/srv/vfs/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) +++ uspace/srv/vfs/Makefile.common (revision 4a537dda1680cfd9fd57ba877d36d641060c8f7f) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +## Common names +# + +LIBC_PREFIX = ../../lib/libc +SOFTINT_PREFIX = ../../lib/softint +LIBS = $(LIBC_PREFIX)/libc.a + +DEPEND = Makefile.depend +DEPEND_PREV = $(DEPEND).prev +OUTPUT = vfs