diff options
| author | midipix <writeonce@midipix.org> | 2016-04-20 12:16:19 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-11-11 00:22:38 -0500 |
| commit | c5b3f2c383247b385e03f1897f3ea8e6399cf59c (patch) | |
| tree | 4d4088f04594fe8c2a4c4d55e1ed9c9d28d3f61c | |
| parent | 3b54fd04de90c45f9b63d36da666b82e8617ffc6 (diff) | |
| download | mdso-c5b3f2c383247b385e03f1897f3ea8e6399cf59c.tar.bz2 mdso-c5b3f2c383247b385e03f1897f3ea8e6399cf59c.tar.xz | |
build system: remove erroneous build-time references to LIBDIR and BINDIR.
| -rw-r--r-- | Makefile.in | 12 | ||||
| -rw-r--r-- | project/defs.mk | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in index 8be384e..e928404 100644 --- a/Makefile.in +++ b/Makefile.in @@ -79,16 +79,16 @@ include $(PROJECT_DIR)/project/overrides.mk $(APP_SRCS:%.c=%.o): version.tag $(APP_SRCS:%.c=%.o): CFLAGS_STATIC = $(CFLAGS_APP) -src/%.lo: $(PROJECT_DIR)/src/%.c $(ALL_HEADERS) host.tag tree.tag +src/%.lo: $(PROJECT_DIR)/src/%.c $(ALL_HEADERS) host.tag dirs.tag $(CC) -c -o $@ $< $(CFLAGS_SHARED) -src/%.o: $(PROJECT_DIR)/src/%.c $(ALL_HEADERS) host.tag tree.tag +src/%.o: $(PROJECT_DIR)/src/%.c $(ALL_HEADERS) host.tag dirs.tag $(CC) -c -o $@ $< $(CFLAGS_STATIC) -$(LIBDIR)/%$(OS_LIB_SUFFIX): +lib/%$(OS_LIB_SUFFIX): $(CC) -shared -o $@ $^ $(LDFLAGS_SHARED) -$(LIBDIR)/%$(OS_ARCHIVE_EXT): +lib/%$(OS_ARCHIVE_EXT): rm -f $@ $(AR) rcs $@ $^ @@ -169,8 +169,8 @@ $(STATIC_APP): $(STATIC_OBJS) $(APP_OBJS) dirs: dirs.tag tree.tag dirs.tag: - mkdir -p $(BINDIR) - mkdir -p $(LIBDIR) + mkdir -p bin + mkdir -p lib touch dirs.tag host.tag: Makefile diff --git a/project/defs.mk b/project/defs.mk index 9c36756..346bb45 100644 --- a/project/defs.mk +++ b/project/defs.mk @@ -14,14 +14,14 @@ APP_OBJS = $(APP_SRCS:.c=.o) SHARED_OBJS = $(COMMON_LOBJS) $(ARCH_LOBJS) STATIC_OBJS = $(COMMON_OBJS) $(ARCH_OBJS) -SHARED_LIB = $(LIBDIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_LIB_SUFFIX) -STATIC_LIB = $(LIBDIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_ARCHIVE_EXT) -SHARED_IMPLIB = $(LIBDIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_IMPLIB_EXT) - -APP = $(BINDIR)/$(OS_APP_PREFIX)$(PACKAGE)$(OS_APP_SUFFIX) -DEFAULT_APP = $(BINDIR)/$(OS_APP_PREFIX)$(PACKAGE)-default$(OS_APP_SUFFIX) -SHARED_APP = $(BINDIR)/$(OS_APP_PREFIX)$(PACKAGE)-shared$(OS_APP_SUFFIX) -STATIC_APP = $(BINDIR)/$(OS_APP_PREFIX)$(PACKAGE)-static$(OS_APP_SUFFIX) +SHARED_LIB = lib/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_LIB_SUFFIX) +STATIC_LIB = lib/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_ARCHIVE_EXT) +SHARED_IMPLIB = lib/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_IMPLIB_EXT) + +APP = bin/$(OS_APP_PREFIX)$(PACKAGE)$(OS_APP_SUFFIX) +DEFAULT_APP = bin/$(OS_APP_PREFIX)$(PACKAGE)-default$(OS_APP_SUFFIX) +SHARED_APP = bin/$(OS_APP_PREFIX)$(PACKAGE)-shared$(OS_APP_SUFFIX) +STATIC_APP = bin/$(OS_APP_PREFIX)$(PACKAGE)-static$(OS_APP_SUFFIX) CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_CONFIG) $(CFLAGS_SYSROOT) \ $(CFLAGS_COMMON) $(CFLAGS_CMDLINE) $(CFLAGS_HOST) \ |