altomaltes / cross / slibtool
Forked from cross/slibtool 2 years ago
83ef8c
build system: remove erroneous build-time references to LIBDIR and BINDIR.
Authored and Committed by 
midipix
8 years ago
Makefile.in
CHANGED
|
@@ -79,16 +79,16 @@ include $(PROJECT_DIR)/project/overrides.mk
|
|
|
79
79
|
(APP_SRCS:%.c=%.o): version.tag
|
|
80
80
|
(APP_SRCS:%.c=%.o): CFLAGS_STATIC = $(CFLAGS_APP)
|
|
81
81
|
|
|
82
|
-
src/%.lo: $(PROJECT_DIR)/src/%.c $(ALL_HEADERS) host.tag
|
|
82
|
+
src/%.lo: $(PROJECT_DIR)/src/%.c $(ALL_HEADERS) host.tag dirs.tag
|
|
83
83
|
$(CC) -c -o $@ $< $(CFLAGS_SHARED)
|
|
84
84
|
|
|
85
|
-
src/%.o: $(PROJECT_DIR)/src/%.c $(ALL_HEADERS) host.tag
|
|
85
|
+
src/%.o: $(PROJECT_DIR)/src/%.c $(ALL_HEADERS) host.tag dirs.tag
|
|
86
86
|
$(CC) -c -o $@ $< $(CFLAGS_STATIC)
|
|
87
87
|
|
|
88
|
-
|
|
88
|
+
lib/%$(OS_LIB_SUFFIX):
|
|
89
89
|
$(CC) -shared -o $@ $^ $(LDFLAGS_SHARED)
|
|
90
90
|
|
|
91
|
-
|
|
91
|
+
lib/%$(OS_ARCHIVE_EXT):
|
|
92
92
|
rm -f $@
|
|
93
93
|
$(AR) rcs $@ $^
|
|
94
94
|
|
|
@@ -169,8 +169,8 @@ $(STATIC_APP): $(STATIC_OBJS) $(APP_OBJS)
|
|
|
169
169
|
dirs: dirs.tag tree.tag
|
|
170
170
|
|
|
171
171
|
dirs.tag:
|
|
172
|
-
mkdir -p
|
|
173
|
-
mkdir -p
|
|
172
|
+
mkdir -p bin
|
|
173
|
+
mkdir -p lib
|
|
174
174
|
touch dirs.tag
|
|
175
175
|
|
|
176
176
|
host.tag: Makefile
|
project/defs.mk
CHANGED
|
@@ -14,14 +14,14 @@ APP_OBJS = $(APP_SRCS:.c=.o)
|
|
|
14
14
|
SHARED_OBJS = $(COMMON_LOBJS) $(ARCH_LOBJS)
|
|
15
15
|
STATIC_OBJS = $(COMMON_OBJS) $(ARCH_OBJS)
|
|
16
16
|
|
|
17
|
-
SHARED_LIB =
|
|
18
|
-
STATIC_LIB =
|
|
19
|
-
SHARED_IMPLIB =
|
|
20
|
-
|
|
21
|
-
APP =
|
|
22
|
-
DEFAULT_APP =
|
|
23
|
-
SHARED_APP =
|
|
24
|
-
STATIC_APP =
|
|
17
|
+
SHARED_LIB = lib/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_LIB_SUFFIX)
|
|
18
|
+
STATIC_LIB = lib/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_ARCHIVE_EXT)
|
|
19
|
+
SHARED_IMPLIB = lib/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_IMPLIB_EXT)
|
|
20
|
+
|
|
21
|
+
APP = bin/$(OS_APP_PREFIX)$(PACKAGE)$(OS_APP_SUFFIX)
|
|
22
|
+
DEFAULT_APP = bin/$(OS_APP_PREFIX)$(PACKAGE)-default$(OS_APP_SUFFIX)
|
|
23
|
+
SHARED_APP = bin/$(OS_APP_PREFIX)$(PACKAGE)-shared$(OS_APP_SUFFIX)
|
|
24
|
+
STATIC_APP = bin/$(OS_APP_PREFIX)$(PACKAGE)-static$(OS_APP_SUFFIX)
|
|
25
25
|
|
|
26
26
|
CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_CONFIG) $(CFLAGS_SYSROOT) \
|
|
27
27
|
$(CFLAGS_COMMON) $(CFLAGS_CMDLINE) $(CFLAGS_HOST) \
|