summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com>2013-02-27 12:12:01 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-02-27 07:43:57 -0800
commit6a29da800b31ddc81bf3f2636aa7b124d1b96e7e (patch)
treeb868c1b3ae19c81bfb0153d81a10a3791b7409fd /Makefile
parent1c290ebe5b8a79d18bd18f74e149af73fda0cb14 (diff)
downloadsubsurface-6a29da800b31ddc81bf3f2636aa7b124d1b96e7e.tar.gz
Add target `all' to avoid "target order is important" confusion.
Signed-off-by: Cristian Ionescu-Idbohrn <cii@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 9 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index d3fdba43d..c620df2e8 100644
--- a/Makefile
+++ b/Makefile
@@ -163,6 +163,9 @@ OBJS = main.o dive.o time.o profile.o info.o equipment.o divelist.o deco.o plann
DEPS = $(wildcard .dep/*.dep)
+
+all: $(NAME)
+
$(NAME): gen_version_file $(OBJS) $(MSGOBJS) $(INFOPLIST)
$(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS)
@@ -172,7 +175,7 @@ ifneq ($(STORED_VERSION_STRING),$(VERSION_STRING))
@echo \#define VERSION_STRING \"$(VERSION_STRING)\" >$(VERSION_FILE)
endif
-install: $(NAME)
+install: all
$(INSTALL) -d -m 755 $(BINDIR)
$(INSTALL) $(NAME) $(BINDIR)
$(INSTALL) -d -m 755 $(DESKTOPDIR)
@@ -195,7 +198,7 @@ install: $(NAME)
done
-install-macosx: $(NAME)
+install-macosx: all
$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources
$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/MacOS
$(INSTALL) $(NAME) $(MACOSXINSTALL)/Contents/MacOS/$(NAME)-bin
@@ -214,7 +217,7 @@ install-macosx: $(NAME)
fi
-create-macosx-bundle: $(NAME)
+create-macosx-bundle: all
$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources
$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/MacOS
$(INSTALL) $(NAME) $(MACOSXSTAGING)/Contents/MacOS/
@@ -232,10 +235,10 @@ create-macosx-bundle: $(NAME)
fi
$(GTK_MAC_BUNDLER) packaging/macosx/subsurface.bundle
-sign-macosx-bundle: $(NAME)
+sign-macosx-bundle: all
codesign -s "3A8CE62A483083EDEA5581A61E770EC1FA8BECE8" /Applications/Subsurface.app/Contents/MacOS/subsurface-bin
-install-cross-windows: $(NAME)
+install-cross-windows: all
$(INSTALL) -d -m 755 $(WINDOWSSTAGING)/share/locale
for MSG in $(WINMSGDIRS); do\
$(INSTALL) -d -m 755 $(WINDOWSSTAGING)/$$MSG;\
@@ -246,7 +249,7 @@ install-cross-windows: $(NAME)
$(INSTALL) $$LOC/subsurface.mo $(WINDOWSSTAGING)/$$LOC/subsurface.mo; \
done
-create-windows-installer: $(NAME) $(NSIFILE) install-cross-windows
+create-windows-installer: all $(NSIFILE) install-cross-windows
$(MAKENSIS) $(NSIFILE)
$(NSIFILE): $(NSIINPUTFILE)