diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-06-05 04:23:52 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-06-05 04:23:52 +0200 |
| commit | bec5f87053759705fb77bae1aa378f2666c7d153 (patch) | |
| tree | bd955b9777aa39b207fa161edf19a6609f822909 /plugins/Makefile.plugin.mk | |
| parent | 1c99a41a296cda6647edc32437a813f6923cb1d0 (diff) | |
| parent | 4e10e30c2f99d552239871aa1b27a08a6c18f1a4 (diff) | |
Merge tag 'upstream/0.23.1'
Upstream version 0.23.1
Diffstat (limited to 'plugins/Makefile.plugin.mk')
| -rw-r--r-- | plugins/Makefile.plugin.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/plugins/Makefile.plugin.mk b/plugins/Makefile.plugin.mk index 539de86..03df7b0 100644 --- a/plugins/Makefile.plugin.mk +++ b/plugins/Makefile.plugin.mk @@ -34,17 +34,16 @@ SRC_FILES := ../common/Resources.vala $(SRC_FILES) CFILES := $(notdir $(SRC_FILES:.vala=.c)) OFILES := $(notdir $(SRC_FILES:.vala=.o)) -CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS) $(PLUGIN_PKGS)` -nostdlib -export-dynamic $(PLUGIN_CFLAGS) -LIBS := `pkg-config --print-errors --libs $(EXT_PKGS) $(PLUGIN_PKGS)` +CFLAGS := $(shell pkg-config --print-errors --cflags $(EXT_PKGS) $(PLUGIN_PKGS)) \ + -nostdlib -export-dynamic $(PLUGIN_CFLAGS) +LIBS := $(shell pkg-config --print-errors --libs $(EXT_PKGS) $(PLUGIN_PKGS)) DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"shotwell"' all: $(PLUGIN).so .stamp: $(SRC_FILES) $(MAKE_FILES) $(HEADER_FILES) - $(VALAC) --target-glib=$(MIN_GLIB_VERSION) -g --enable-checking --fatal-warnings --save-temps --compile --enable-deprecated \ + $(VALAC) --target-glib=$(MIN_GLIB_VERSION) -g --enable-checking --fatal-warnings --ccode --enable-deprecated \ --vapidir=../ $(foreach pkg,$(PKGS),--pkg=$(pkg)) $(foreach pkg,$(CUSTOM_VAPI_PKGS),--pkg=$(pkg)) \ - -X -I../.. -X -fPIC \ - $(foreach dfn,$(DEFINES),-X $(dfn)) \ $(USER_VALAFLAGS) \ --vapidir=../../vapi \ $(SRC_FILES) @@ -53,11 +52,11 @@ all: $(PLUGIN).so $(CFILES): .stamp @ -$(OFILES): %.o: %.c $(CFILES) - $(CC) -c $(CFLAGS) $(DEFINES) -I../.. $(CFILES) +.c.o: + $(CC) -c $(CFLAGS) $(DEFINES) -I../.. $< $(PLUGIN).so: $(OFILES) - $(CC) $(CFLAGS) $(LDFLAGS) -shared $(OFILES) $(LIBS) -o $@ + $(CC) $(LDFLAGS) -shared $(OFILES) $(LIBS) -o $@ .PHONY: cleantemps cleantemps: |