summaryrefslogtreecommitdiffhomepage
path: root/project
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-04-20 12:16:19 -0400
committermidipix <writeonce@midipix.org>2016-04-20 13:33:34 -0400
commit83ef8cfe96f159198fc1b45e46633b28e227d57c (patch)
treed50ce3c1f662edbd32318f5382bfb6e47ea4983d /project
parentaf8d176b6291c45bffb3e2d2e98d6260571c99af (diff)
downloadslibtool-83ef8cfe96f159198fc1b45e46633b28e227d57c.tar.bz2
slibtool-83ef8cfe96f159198fc1b45e46633b28e227d57c.tar.xz
build system: remove erroneous build-time references to LIBDIR and BINDIR.
Diffstat (limited to 'project')
-rw-r--r--project/defs.mk16
1 files changed, 8 insertions, 8 deletions
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) \