From eb499eb8ecf74a6c461f8ce3ee4fa482ed2a3c16 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 28 Jul 2014 21:38:18 +0200 Subject: move mk files into mk dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- Makefile | 4 ++-- build.mk | 60 --------------------------------------------------- config.mk | 70 ------------------------------------------------------------ mk/build.mk | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ mk/config.mk | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 132 insertions(+), 132 deletions(-) delete mode 100644 build.mk delete mode 100644 config.mk create mode 100644 mk/build.mk create mode 100644 mk/config.mk diff --git a/Makefile b/Makefile index cec32a8..041c30f 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ # Include configurations. -include config.mk +include mk/config.mk # Object files for the libary. @@ -32,7 +32,7 @@ OBJ_mds-registry = $(foreach O,$(OBJ_mds-registry_),obj/mds-registry/$(O).o) .PHONY: all all: servers libraries -include build.mk +include mk/build.mk # Set permissions on built files. diff --git a/build.mk b/build.mk deleted file mode 100644 index e8bbd0e..0000000 --- a/build.mk +++ /dev/null @@ -1,60 +0,0 @@ -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. This file is offered as-is, -# without any warranty. - - -.PHONY: libraries -libraries: bin/libmdsserver.so - -.PHONY: servers -servers: $(foreach S,$(SERVERS),bin/$(S)) - - -# Link large servers. - -bin/mds-server: $(OBJ_mds-server) obj/mds-base.o bin/libmdsserver.so - mkdir -p $(shell dirname $@) - $(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds-server) $(OBJ_mds-server) obj/mds-base.o -ifeq ($(DEBUG),y) - mv $@ $@.real - cp test.d/mds-server $@ -endif - - -bin/mds-registry: $(OBJ_mds-registry) obj/mds-base.o bin/libmdsserver.so - mkdir -p $(shell dirname $@) - $(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds-registry) $(OBJ_mds-registry) obj/mds-base.o - - -# Link small servers. - -bin/%: obj/%.o obj/mds-base.o bin/libmdsserver.so - mkdir -p $(shell dirname $@) - $(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_$*) $< obj/mds-base.o - - -# Link kernel. - -bin/mds: obj/mds.o bin/libmdsserver.so - mkdir -p $(shell dirname $@) - $(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds) $< - - -# Build object files for kernel/servers. - -obj/%.o: src/%.c $(shell dirname src/%)/*.h src/mds-base.h src/libmdsserver/*.h - mkdir -p $(shell dirname $@) - $(CC) $(C_FLAGS) -Isrc -c -o $@ $< - - -# Build libmdsserver. - -bin/libmdsserver.so: $(foreach O,$(LIBOBJ),obj/libmdsserver/$(O).o) - mkdir -p $(shell dirname $@) - $(CC) $(C_FLAGS) -shared -o $@ $^ - -obj/libmdsserver/%.o: src/libmdsserver/%.c src/libmdsserver/*.h - mkdir -p $(shell dirname $@) - $(CC) $(C_FLAGS) -fPIC -c -o $@ $< - diff --git a/config.mk b/config.mk deleted file mode 100644 index 25e50b8..0000000 --- a/config.mk +++ /dev/null @@ -1,70 +0,0 @@ -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. This file is offered as-is, -# without any warranty. - - -# The package path prefix, if you want to install to another root, set DESTDIR to that root. -PREFIX ?= /usr -# The command path excluding prefix. -BIN ?= /bin -# The library path excluding prefix. -LIB ?= /lib -# The executable library path excluding prefix. -LIBEXEC ?= /libexec -# The resource path excluding prefix. -DATA ?= /share -# The command path including prefix. -BINDIR ?= $(PREFIX)$(BIN) -# The library path including prefix. -LIBDIR ?= $(PREFIX)$(LIB) -# The executable library path including prefix. -LIBEXECDIR ?= $(PREFIX)$(LIBEXEC) -# The resource path including prefix. -DATADIR ?= $(PREFIX)$(DATA) -# The generic documentation path including prefix. -DOCDIR ?= $(DATADIR)/doc -# The info manual documentation path including prefix. -INFODIR ?= $(DATADIR)/info -# The license base path including prefix. -LICENSEDIR ?= $(DATADIR)/licenses - -# The name of the package as it should be installed. -PKGNAME ?= mds - - -# Optimisation level (and debug flags.) -OPTIMISE = -Og -g - -# Enabled Warnings. -WARN = -Wall -Wextra -pedantic -Wdouble-promotion -Wformat=2 -Winit-self \ - -Wmissing-include-dirs -Wtrampolines -Wfloat-equal -Wshadow \ - -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls \ - -Wnested-externs -Winline -Wno-variadic-macros -Wsign-conversion \ - -Wswitch-default -Wconversion -Wsync-nand -Wunsafe-loop-optimizations \ - -Wcast-align -Wstrict-overflow -Wdeclaration-after-statement -Wundef \ - -Wbad-function-cast -Wcast-qual -Wwrite-strings -Wlogical-op \ - -Waggregate-return -Wstrict-prototypes -Wold-style-definition -Wpacked \ - -Wvector-operation-performance -Wunsuffixed-float-constants \ - -Wsuggest-attribute=const -Wsuggest-attribute=noreturn \ - -Wsuggest-attribute=pure -Wsuggest-attribute=format -Wnormalized=nfkc - -# The C standard used in the code. -STD = gnu99 - -# Libraries linking flags. -LDS = -pthread -Lbin -lmdsserver -lrt - -# C compiler debug flags. -DEBUG_FLAGS = -ifeq ($(DEBUG),y) -DEBUG_FLAGS += -D'DEBUG' -DEBUG_FLAGS += -D'LIBEXECDIR="$(shell pwd)/bin"' -endif - -# Options for the C compiler. -C_FLAGS = $(OPTIMISE) $(WARN) -std=$(STD) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \ - -ftree-vrp -fstrict-aliasing -fipa-pure-const -fstack-usage \ - -fstrict-overflow -funsafe-loop-optimizations -fno-builtin \ - -D'_GNU_SOURCE' -D'PKGNAME="$(PKGNAME)"' $(DEBUG_FLAGS) - diff --git a/mk/build.mk b/mk/build.mk new file mode 100644 index 0000000..e8bbd0e --- /dev/null +++ b/mk/build.mk @@ -0,0 +1,60 @@ +# Copying and distribution of this file, with or without modification, +# are permitted in any medium without royalty provided the copyright +# notice and this notice are preserved. This file is offered as-is, +# without any warranty. + + +.PHONY: libraries +libraries: bin/libmdsserver.so + +.PHONY: servers +servers: $(foreach S,$(SERVERS),bin/$(S)) + + +# Link large servers. + +bin/mds-server: $(OBJ_mds-server) obj/mds-base.o bin/libmdsserver.so + mkdir -p $(shell dirname $@) + $(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds-server) $(OBJ_mds-server) obj/mds-base.o +ifeq ($(DEBUG),y) + mv $@ $@.real + cp test.d/mds-server $@ +endif + + +bin/mds-registry: $(OBJ_mds-registry) obj/mds-base.o bin/libmdsserver.so + mkdir -p $(shell dirname $@) + $(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds-registry) $(OBJ_mds-registry) obj/mds-base.o + + +# Link small servers. + +bin/%: obj/%.o obj/mds-base.o bin/libmdsserver.so + mkdir -p $(shell dirname $@) + $(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_$*) $< obj/mds-base.o + + +# Link kernel. + +bin/mds: obj/mds.o bin/libmdsserver.so + mkdir -p $(shell dirname $@) + $(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds) $< + + +# Build object files for kernel/servers. + +obj/%.o: src/%.c $(shell dirname src/%)/*.h src/mds-base.h src/libmdsserver/*.h + mkdir -p $(shell dirname $@) + $(CC) $(C_FLAGS) -Isrc -c -o $@ $< + + +# Build libmdsserver. + +bin/libmdsserver.so: $(foreach O,$(LIBOBJ),obj/libmdsserver/$(O).o) + mkdir -p $(shell dirname $@) + $(CC) $(C_FLAGS) -shared -o $@ $^ + +obj/libmdsserver/%.o: src/libmdsserver/%.c src/libmdsserver/*.h + mkdir -p $(shell dirname $@) + $(CC) $(C_FLAGS) -fPIC -c -o $@ $< + diff --git a/mk/config.mk b/mk/config.mk new file mode 100644 index 0000000..25e50b8 --- /dev/null +++ b/mk/config.mk @@ -0,0 +1,70 @@ +# Copying and distribution of this file, with or without modification, +# are permitted in any medium without royalty provided the copyright +# notice and this notice are preserved. This file is offered as-is, +# without any warranty. + + +# The package path prefix, if you want to install to another root, set DESTDIR to that root. +PREFIX ?= /usr +# The command path excluding prefix. +BIN ?= /bin +# The library path excluding prefix. +LIB ?= /lib +# The executable library path excluding prefix. +LIBEXEC ?= /libexec +# The resource path excluding prefix. +DATA ?= /share +# The command path including prefix. +BINDIR ?= $(PREFIX)$(BIN) +# The library path including prefix. +LIBDIR ?= $(PREFIX)$(LIB) +# The executable library path including prefix. +LIBEXECDIR ?= $(PREFIX)$(LIBEXEC) +# The resource path including prefix. +DATADIR ?= $(PREFIX)$(DATA) +# The generic documentation path including prefix. +DOCDIR ?= $(DATADIR)/doc +# The info manual documentation path including prefix. +INFODIR ?= $(DATADIR)/info +# The license base path including prefix. +LICENSEDIR ?= $(DATADIR)/licenses + +# The name of the package as it should be installed. +PKGNAME ?= mds + + +# Optimisation level (and debug flags.) +OPTIMISE = -Og -g + +# Enabled Warnings. +WARN = -Wall -Wextra -pedantic -Wdouble-promotion -Wformat=2 -Winit-self \ + -Wmissing-include-dirs -Wtrampolines -Wfloat-equal -Wshadow \ + -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls \ + -Wnested-externs -Winline -Wno-variadic-macros -Wsign-conversion \ + -Wswitch-default -Wconversion -Wsync-nand -Wunsafe-loop-optimizations \ + -Wcast-align -Wstrict-overflow -Wdeclaration-after-statement -Wundef \ + -Wbad-function-cast -Wcast-qual -Wwrite-strings -Wlogical-op \ + -Waggregate-return -Wstrict-prototypes -Wold-style-definition -Wpacked \ + -Wvector-operation-performance -Wunsuffixed-float-constants \ + -Wsuggest-attribute=const -Wsuggest-attribute=noreturn \ + -Wsuggest-attribute=pure -Wsuggest-attribute=format -Wnormalized=nfkc + +# The C standard used in the code. +STD = gnu99 + +# Libraries linking flags. +LDS = -pthread -Lbin -lmdsserver -lrt + +# C compiler debug flags. +DEBUG_FLAGS = +ifeq ($(DEBUG),y) +DEBUG_FLAGS += -D'DEBUG' +DEBUG_FLAGS += -D'LIBEXECDIR="$(shell pwd)/bin"' +endif + +# Options for the C compiler. +C_FLAGS = $(OPTIMISE) $(WARN) -std=$(STD) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \ + -ftree-vrp -fstrict-aliasing -fipa-pure-const -fstack-usage \ + -fstrict-overflow -funsafe-loop-optimizations -fno-builtin \ + -D'_GNU_SOURCE' -D'PKGNAME="$(PKGNAME)"' $(DEBUG_FLAGS) + -- cgit v1.2.3-70-g09d2