From c0ca973d8356cacc3ecde24d242297ea23e11c28 Mon Sep 17 00:00:00 2001 From: midipix Date: Wed, 26 Dec 2018 08:48:48 -0500 Subject: build system: major overhaul: removed sysinfo, integrated ccenv. --- sysinfo/os/any-os.mk | 16 --------- sysinfo/os/bsd.mk | 14 -------- sysinfo/os/cygwin.mk | 17 --------- sysinfo/os/darwin.mk | 18 ---------- sysinfo/os/elf.mk | 6 ---- sysinfo/os/linux.mk | 14 -------- sysinfo/os/midipix.mk | 15 -------- sysinfo/os/mingw.mk | 18 ---------- sysinfo/os/mingw32.mk | 1 - sysinfo/os/mingw64.mk | 1 - sysinfo/os/msys.mk | 18 ---------- sysinfo/os/pe.mk | 99 --------------------------------------------------- 12 files changed, 237 deletions(-) delete mode 100644 sysinfo/os/any-os.mk delete mode 100644 sysinfo/os/bsd.mk delete mode 100644 sysinfo/os/cygwin.mk delete mode 100644 sysinfo/os/darwin.mk delete mode 100644 sysinfo/os/elf.mk delete mode 100644 sysinfo/os/linux.mk delete mode 100644 sysinfo/os/midipix.mk delete mode 100644 sysinfo/os/mingw.mk delete mode 100644 sysinfo/os/mingw32.mk delete mode 100644 sysinfo/os/mingw64.mk delete mode 100644 sysinfo/os/msys.mk delete mode 100644 sysinfo/os/pe.mk (limited to 'sysinfo/os') diff --git a/sysinfo/os/any-os.mk b/sysinfo/os/any-os.mk deleted file mode 100644 index 6c5a2af..0000000 --- a/sysinfo/os/any-os.mk +++ /dev/null @@ -1,16 +0,0 @@ -OS = any-os -OS_APP_PREFIX = -OS_APP_SUFFIX = -OS_LIB_PREFIX = lib -OS_LIB_SUFFIX = .so -OS_IMPLIB_EXT = .invalid -OS_LIBDEF_EXT = .invalid -OS_ARCHIVE_EXT = .a -OS_SONAME = symlink -OS_BINFMT = ELF - -.PHONY: $(IMPLIB_DEF) $(IMPLIB_VER) $(IMPLIB_SONAME) $(IMPLIB_SOLINK) - -# dso suffix notation -OS_LIB_PREFIXED_SUFFIX = $(OS_LIB_SUFFIX) -OS_LIB_SUFFIXED_SUFFIX = diff --git a/sysinfo/os/bsd.mk b/sysinfo/os/bsd.mk deleted file mode 100644 index 67453da..0000000 --- a/sysinfo/os/bsd.mk +++ /dev/null @@ -1,14 +0,0 @@ -OS = bsd -OS_APP_PREFIX = -OS_APP_SUFFIX = -OS_LIB_PREFIX = lib -OS_LIB_SUFFIX = .so -OS_IMPLIB_EXT = .invalid -OS_LIBDEF_EXT = .invalid -OS_ARCHIVE_EXT = .a -OS_SONAME = symlink -OS_BINFMT = ELF - -# dso suffix notation -OS_LIB_PREFIXED_SUFFIX = $(OS_LIB_SUFFIX) -OS_LIB_SUFFIXED_SUFFIX = diff --git a/sysinfo/os/cygwin.mk b/sysinfo/os/cygwin.mk deleted file mode 100644 index 290aa0d..0000000 --- a/sysinfo/os/cygwin.mk +++ /dev/null @@ -1,17 +0,0 @@ -OS = cygwin -OS_APP_PREFIX = -OS_APP_SUFFIX = .exe -OS_LIB_PREFIX = lib -OS_LIB_SUFFIX = .dll -OS_IMPLIB_EXT = .dll.a -OS_LIBDEF_EXT = .def -OS_ARCHIVE_EXT = .a -OS_SONAME = copy -OS_BINFMT = PE -OS_IMPLIB_TOOL = dlltool - -CFLAGS_PIC = - -# dso suffix notation -OS_LIB_PREFIXED_SUFFIX = $(OS_LIB_SUFFIX) -OS_LIB_SUFFIXED_SUFFIX = diff --git a/sysinfo/os/darwin.mk b/sysinfo/os/darwin.mk deleted file mode 100644 index abc9bc7..0000000 --- a/sysinfo/os/darwin.mk +++ /dev/null @@ -1,18 +0,0 @@ -OS = darwin -OS_APP_PREFIX = -OS_APP_SUFFIX = -OS_LIB_PREFIX = lib -OS_LIB_SUFFIX = .dylib -OS_IMPLIB_EXT = .invalid -OS_LIBDEF_EXT = .invalid -OS_ARCHIVE_EXT = .a -OS_SONAME = symlink -OS_BINFMT = MACHO - -CFLAGS_OS += -D_DARWIN_C_SOURCE - -.PHONY: $(IMPLIB_DEF) $(IMPLIB_VER) $(IMPLIB_SONAME) $(IMPLIB_SOLINK) - -# dso suffix notation -OS_LIB_PREFIXED_SUFFIX = -OS_LIB_SUFFIXED_SUFFIX = $(OS_LIB_SUFFIX) diff --git a/sysinfo/os/elf.mk b/sysinfo/os/elf.mk deleted file mode 100644 index 6878c6a..0000000 --- a/sysinfo/os/elf.mk +++ /dev/null @@ -1,6 +0,0 @@ -DSO_REF_VER = $(SHARED_LIB) -DSO_REF_SONAME = $(SHARED_SONAME) -DSO_REF_SOLINK = $(SHARED_SOLINK) - -LDFLAGS_SHARED += -Wl,-soname -LDFLAGS_SHARED += -Wl,$(DSO_SONAME) diff --git a/sysinfo/os/linux.mk b/sysinfo/os/linux.mk deleted file mode 100644 index b9a5f5c..0000000 --- a/sysinfo/os/linux.mk +++ /dev/null @@ -1,14 +0,0 @@ -OS = linux -OS_APP_PREFIX = -OS_APP_SUFFIX = -OS_LIB_PREFIX = lib -OS_LIB_SUFFIX = .so -OS_IMPLIB_EXT = .invalid -OS_LIBDEF_EXT = .invalid -OS_ARCHIVE_EXT = .a -OS_SONAME = symlink -OS_BINFMT = ELF - -# dso suffix notation -OS_LIB_PREFIXED_SUFFIX = $(OS_LIB_SUFFIX) -OS_LIB_SUFFIXED_SUFFIX = diff --git a/sysinfo/os/midipix.mk b/sysinfo/os/midipix.mk deleted file mode 100644 index d23d387..0000000 --- a/sysinfo/os/midipix.mk +++ /dev/null @@ -1,15 +0,0 @@ -OS = midipix -OS_APP_PREFIX = -OS_APP_SUFFIX = -OS_LIB_PREFIX = lib -OS_LIB_SUFFIX = .so -OS_IMPLIB_EXT = .lib.a -OS_LIBDEF_EXT = .so.def -OS_ARCHIVE_EXT = .a -OS_SONAME = symlink -OS_BINFMT = PE -OS_IMPLIB_TOOL = mdso - -# dso suffix notation -OS_LIB_PREFIXED_SUFFIX = $(OS_LIB_SUFFIX) -OS_LIB_SUFFIXED_SUFFIX = diff --git a/sysinfo/os/mingw.mk b/sysinfo/os/mingw.mk deleted file mode 100644 index 1a352ba..0000000 --- a/sysinfo/os/mingw.mk +++ /dev/null @@ -1,18 +0,0 @@ -OS = mingw -OS_APP_PREFIX = -OS_APP_SUFFIX = .exe -OS_LIB_PREFIX = lib -OS_LIB_SUFFIX = .dll -OS_IMPLIB_EXT = .dll.a -OS_LIBDEF_EXT = .def -OS_ARCHIVE_EXT = .a -OS_SONAME = copy -OS_BINFMT = PE -OS_IMPLIB_TOOL = dlltool - -CFLAGS_PIC = -CFLAGS_OS += -U__STRICT_ANSI__ - -# dso suffix notation -OS_LIB_PREFIXED_SUFFIX = $(OS_LIB_SUFFIX) -OS_LIB_SUFFIXED_SUFFIX = diff --git a/sysinfo/os/mingw32.mk b/sysinfo/os/mingw32.mk deleted file mode 100644 index 542b6a9..0000000 --- a/sysinfo/os/mingw32.mk +++ /dev/null @@ -1 +0,0 @@ -include $(PROJECT_DIR)/sysinfo/os/mingw.mk diff --git a/sysinfo/os/mingw64.mk b/sysinfo/os/mingw64.mk deleted file mode 100644 index 542b6a9..0000000 --- a/sysinfo/os/mingw64.mk +++ /dev/null @@ -1 +0,0 @@ -include $(PROJECT_DIR)/sysinfo/os/mingw.mk diff --git a/sysinfo/os/msys.mk b/sysinfo/os/msys.mk deleted file mode 100644 index 70fcd68..0000000 --- a/sysinfo/os/msys.mk +++ /dev/null @@ -1,18 +0,0 @@ -OS = msys -OS_APP_PREFIX = -OS_APP_SUFFIX = .exe -OS_LIB_PREFIX = lib -OS_LIB_SUFFIX = .dll -OS_IMPLIB_EXT = .dll.a -OS_LIBDEF_EXT = .def -OS_ARCHIVE_EXT = .a -OS_SONAME = copy -OS_BINFMT = PE -OS_IMPLIB_TOOL = dlltool - -CFLAGS_PIC = -CFLAGS_OS += -U__STRICT_ANSI__ - -# dso suffix notation -OS_LIB_PREFIXED_SUFFIX = $(OS_LIB_SUFFIX) -OS_LIB_SUFFIXED_SUFFIX = diff --git a/sysinfo/os/pe.mk b/sysinfo/os/pe.mk deleted file mode 100644 index 6f9e8ef..0000000 --- a/sysinfo/os/pe.mk +++ /dev/null @@ -1,99 +0,0 @@ -DSO_REF_VER = $(IMPLIB_VER) -DSO_REF_SONAME = $(IMPLIB_SONAME) -DSO_REF_SOLINK = $(IMPLIB_SOLINK) - -LDFLAGS_IMPLIB += -Wl,--output-def -LDFLAGS_IMPLIB += -Wl,$(IMPLIB_DEF) - -LDFLAGS_SONAME += -Wl,-soname -LDFLAGS_SONAME += -Wl,$(DSO_SONAME) -LDFLAGS_SHARED += $(LDFLAGS_SONAME) - -DSO_LIBPATH ?= loader -PE_SUBSYSTEM ?= windows -LDFLAGS_COMMON += -Wl,--subsystem=$(PE_SUBSYSTEM) - -implib: implib-ver package-implib-soname package-implib-solink - -implib-ver: shared-lib $(IMPLIB_VER) - -implib-soname: shared-lib $(IMPLIB_SONAME) - -implib-solink: shared-lib $(IMPLIB_SOLINK) - -$(IMPLIB_DEF): shared-lib - -install-implib: install-implib-ver \ - package-install-implib-soname \ - package-install-implib-solink - -install-implib-ver: implib-ver - mkdir -p $(DESTDIR)$(LIBDIR) - cp $(IMPLIB_VER) $(DESTDIR)$(LIBDIR) - -clean-implib: - rm -f $(SHARED_LIB) - rm -f $(IMPLIB_DEF) - rm -f $(IMPLIB_VER) - rm -f $(IMPLIB_SONAME) - rm -f $(IMPLIB_SOLINK) - - -ifeq ($(OS_IMPLIB_TOOL),mdso) - -$(IMPLIB_VER): $(IMPLIB_DEF) - $(MDSO) -m $(HOST_BITS) -i $(IMPLIB_VER) -n $(DSO_VER) -l $(DSO_LIBPATH) $< - -else ifeq ($(OS_IMPLIB_TOOL),dlltool) - -$(IMPLIB_VER): $(IMPLIB_DEF) - $(DLLTOOL) -l $(IMPLIB_VER) -d $(IMPLIB_DEF) -D $(DSO_VER) - -endif - - - -ifeq ($(AVOID_VERSION),yes) - -package-implib-soname: -package-implib-solink: -package-install-implib-soname: -package-install-implib-solink: - -else - -package-implib-soname: implib-soname -package-implib-solink: implib-solink -package-install-implib-soname: install-implib-soname -package-install-implib-solink: install-implib-solink - - -ifeq ($(OS_IMPLIB_TOOL),mdso) - -$(IMPLIB_SONAME): $(IMPLIB_DEF) - $(MDSO) -m $(HOST_BITS) -i $(IMPLIB_SONAME) -n $(DSO_SONAME) $(IMPLIB_DEF) - -else ifeq ($(OS_IMPLIB_TOOL),dlltool) - -$(IMPLIB_SONAME): $(IMPLIB_DEF) - $(DLLTOOL) -l $(IMPLIB_SONAME) -d $(IMPLIB_DEF) -D $(DSO_SONAME) - -endif - - -$(IMPLIB_SOLINK): $(IMPLIB_SONAME) - rm -f $(IMPLIB_SOLINK).tmp - ln -s $(IMP_SONAME) $(IMPLIB_SOLINK).tmp - mv $(IMPLIB_SOLINK).tmp $(IMPLIB_SOLINK) - -install-implib-soname: implib-soname - mkdir -p $(DESTDIR)$(LIBDIR) - cp $(IMPLIB_SONAME) $(DESTDIR)$(LIBDIR) - -install-implib-solink: implib-soname - mkdir -p $(DESTDIR)$(LIBDIR) - rm -f $(IMPLIB_SOLINK).tmp - ln -s $(IMP_SONAME) $(IMPLIB_SOLINK).tmp - mv $(IMPLIB_SOLINK).tmp $(DESTDIR)$(LIBDIR)/$(IMP_SOLINK) - -endif -- cgit v1.2.3