aboutsummaryrefslogtreecommitdiffstats
path: root/lib/observer/src/Makefile
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-09-01 15:00:19 +0200
committerHenrik Nord <[email protected]>2011-09-01 15:00:19 +0200
commit7ca2941ca0ab85d904de658cf495318dcfbda760 (patch)
tree8d6abc1263f8ce56d9baf17755b2523dac77a160 /lib/observer/src/Makefile
parente813241e103aa74d4daf025564b259f3fb9aca5a (diff)
parentbf2d853857bb0e3a7fd5a2660b22b6e743f91f1c (diff)
downloadotp-7ca2941ca0ab85d904de658cf495318dcfbda760.tar.gz
otp-7ca2941ca0ab85d904de658cf495318dcfbda760.tar.bz2
otp-7ca2941ca0ab85d904de658cf495318dcfbda760.zip
Merge branch 'dev' into major
Diffstat (limited to 'lib/observer/src/Makefile')
-rw-r--r--lib/observer/src/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index 2d06cb6bc4..3875b62101 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -56,13 +56,16 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
PRIVDIR= ../priv
WEBTOOLFILES= $(PRIVDIR)/crashdump_viewer.tool
BINDIR= $(PRIVDIR)/bin
+ifeq ($(findstring win32,$(TARGET)),win32)
+WIN32_EXECUTABLES= $(BINDIR)/etop.bat $(BINDIR)/getop.bat $(BINDIR)/cdv.bat
+else
+WIN32_EXECUTABLES=
+endif
EXECUTABLES= \
$(BINDIR)/etop \
$(BINDIR)/getop \
$(BINDIR)/cdv \
- $(BINDIR)/etop.bat \
- $(BINDIR)/getop.bat \
- $(BINDIR)/cdv.bat
+ $(WIN32_EXECUTABLES)
CDVDIR= $(PRIVDIR)/crashdump_viewer
GIF_FILES= \
$(CDVDIR)/collapsd.gif \