summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-04-20 14:01:39 -0400
committermidipix <writeonce@midipix.org>2016-04-21 03:07:21 -0400
commit6bc15ae9345a41766264fbd3304d0157ef314c2b (patch)
treeac91a82859dc027eb501c9349f962a05ddb0b62d
parent349040b8c0b636a01ff66e10b748693129898483 (diff)
downloadntcon-6bc15ae9345a41766264fbd3304d0157ef314c2b.tar.bz2
ntcon-6bc15ae9345a41766264fbd3304d0157ef314c2b.tar.xz
build system: remove erroneous build-time references to LIBDIR.
-rw-r--r--Makefile.in10
-rw-r--r--project/defs.mk6
2 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in
index 1be3ac5..6b10e46 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,16 +74,16 @@ include $(PROJECT_DIR)/project/overrides.mk
-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):
$(LD) -shared -o $@ $^ $(LDFLAGS_SHARED)
-$(LIBDIR)/%$(OS_ARCHIVE_EXT):
+lib/%$(OS_ARCHIVE_EXT):
rm -f $@
$(AR) rcs $@ $^
@@ -136,7 +136,7 @@ $(STATIC_LIB): $(STATIC_OBJS)
dirs: dirs.tag tree.tag
dirs.tag:
- mkdir -p $(LIBDIR)
+ mkdir -p lib
touch dirs.tag
host.tag: Makefile
diff --git a/project/defs.mk b/project/defs.mk
index 1f352be..b91ed07 100644
--- a/project/defs.mk
+++ b/project/defs.mk
@@ -11,9 +11,9 @@ ARCH_OBJS = $(ARCH_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)
+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)
CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_CONFIG) $(CFLAGS_SYSROOT) \
$(CFLAGS_COMMON) $(CFLAGS_CMDLINE) $(CFLAGS_HOST) \