summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-07-24 23:30:50 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-07-24 23:30:50 +0200
commitede659f2715e84d2c729ca835a32f992aac30d27 (patch)
tree2c4b711e227d6d3e8b53d2cc60fe70cf45609044 /Makefile
parente7c80abb6d223e56a9d843b7c18021565c672c28 (diff)
rewrite debian/copyright, debian/changelogdebian/0.18.1-2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 17948ed..18f1e02 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ LIB=lib
-include configure.mk
ifndef LIBEXECDIR
-LIBEXECDIR=$(PREFIX)/share/shotwell
+LIBEXECDIR=$(PREFIX)/libexec/shotwell
endif
CORE_SUPPORTED_LANGUAGES=$(shell cat po/LINGUAS)
@@ -35,7 +35,7 @@ CORE_SUPPORTED_LANGUAGES=$(shell cat po/LINGUAS)
LOCAL_LANG_DIR=locale-langpack
SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale
-VALAFLAGS := $(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w)) --enable-checking --target-glib=2.32 --thread --fatal-warnings --enable-experimental --enable-deprecated $(USER_VALAFLAGS)
+VALAFLAGS := -g --enable-checking --target-glib=2.32 --thread --fatal-warnings --enable-experimental --enable-deprecated $(USER_VALAFLAGS)
ifdef UNITY_SUPPORT
VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT
endif
@@ -673,7 +673,7 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
@
$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
- $(CC) -c $(VALA_CFLAGS) $(CPPFLAGS) $(CFLAGS) -o $@ $<
+ $(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<
$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN) misc/gschemas.compiled $(DOC_LANG_STAMP)
$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@