summaryrefslogtreecommitdiffhomepage
path: root/Makefile.in
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-05-05 15:29:42 -0400
committermidipix <writeonce@midipix.org>2016-11-11 00:22:41 -0500
commit31ed663b2582ac55762ced2a44462ba2f448460e (patch)
treee362178c36da9b09cb538b72005c778c18ddd0d4 /Makefile.in
parentf89e82dfe9395298f6b4dadf45d4e57f35819dd4 (diff)
downloadmdso-31ed663b2582ac55762ced2a44462ba2f448460e.tar.bz2
mdso-31ed663b2582ac55762ced2a44462ba2f448460e.tar.xz
build system: Makefile.in, custom.mk: added --all-[static|shared] support.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in18
1 files changed, 13 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index 5739b0f..5a02d0f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,8 +104,13 @@ all: shared static app
install: install-libs install-headers install-app install-extras
-app: default-app
+app: package-app app-tag
+app-tag: package-app app.tag
+
+app.tag: package-app
+ cp $(PACKAGE_APP) $(APP)
+ touch app.tag
install-libs: install-shared install-static install-libs-extras
@@ -147,11 +152,11 @@ static-lib: static-objs $(STATIC_LIB)
-default-app: version.tag static $(DEFAULT_APP) $(APP)
+default-app: version.tag static-objs $(DEFAULT_APP)
shared-app: version.tag shared $(SHARED_APP)
-static-app: version.tag static $(STATIC_APP)
+static-app: version.tag static-objs $(STATIC_APP)
@@ -167,16 +172,18 @@ $(SHARED_LIB): $(SHARED_OBJS)
$(STATIC_LIB): $(STATIC_OBJS)
-$(APP): $(DEFAULT_APP)
- cp $^ $@
+$(APP): $(PACKAGE_APP)
$(DEFAULT_APP): $(STATIC_OBJS) $(APP_OBJS)
+ rm -f app.tag
$(CC) -o $@ $^ $(LDFLAGS_APP)
$(SHARED_APP): $(SHARED_LIB) $(APP_OBJS)
+ rm -f app.tag
$(CC) -o $@ $(APP_OBJS) -l$(PACKAGE) $(LDFLAGS_SHARED)
$(STATIC_APP): $(STATIC_OBJS) $(APP_OBJS)
+ rm -f app.tag
$(CC) -static -o $@ $^ -l$(PACKAGE) $(LDFLAGS_STATIC)
@@ -322,6 +329,7 @@ clean: clean-implib
.PHONY: all install shared static app .display \
+ package-app \
shared-objs shared-lib \
static-objs static-lib \
default-app shared-app static-app \