Commit 3a3815d6 authored by Fryderyk Dziarmagowski's avatar Fryderyk Dziarmagowski Committed by Lucas Beeler

Fixes plugin linkage problems on some platforms. Closes #3757.

parent 10b22474
......@@ -12,6 +12,7 @@ Jürg Billeter <j@bitron.ch>
Jonas Bushart <eberhardtjonas@aol.com>
Matthias Clasen <matthias.clasen@gmail.com>
Valentin David <valentin.david@gmail.com>
Fryderyk Dziarmagowski <fdziarmagowski@gmail.com>
Josh Freeman <josh@twilightedge.com>
guillaumev <guillaume@viguierjust.com>
Mikko Huhtala <mikko.t.huhtala@gmail.com>
......
......@@ -23,8 +23,8 @@ include ../plugins.mk
PKGS := $(shell sed ':a;N;$$!ba;s/\n/ /g' ../shotwell-plugin-dev-1.0.deps) $(PKGS)
# automatically include the shotwell-plugin-dev-1.0 package as a local dependency
EXT_PKGS := $(PKGS)
PKGS := shotwell-plugin-dev-1.0 $(PKGS)
EXT_PKGS := $(PKGS)
PKGS := shotwell-plugin-dev-1.0 $(PKGS) $(PLUGIN_PKGS)
# automatically include the Resources.vala common file
SRC_FILES := ../common/Resources.vala $(SRC_FILES)
......@@ -32,8 +32,8 @@ 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)` -nostdlib -export-dynamic $(PLUGIN_CFLAGS)
LDFLAGS := `pkg-config --print-errors --libs $(EXT_PKGS)` $(LDFLAGS)
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)`
DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"shotwell"'
all: $(PLUGIN).so
......@@ -55,7 +55,7 @@ $(OFILES): %.o: %.c $(CFILES)
$(CC) -c $(CFLAGS) $(DEFINES) -I../.. $(CFILES)
$(PLUGIN).so: $(OFILES)
$(CC) $(CFLAGS) -Wl,--no-as-needed $(LDFLAGS) $(OFILES) -I../.. -shared -o $@
$(CC) $(CFLAGS) $(LDFLAGS) -shared $(OFILES) $(LIBS) -o $@
.PHONY: cleantemps
cleantemps:
......
PLUGIN := shotwell-publishing-extras
PKGS := \
PLUGIN_PKGS := \
gtk+-3.0 \
libsoup-2.4 \
libxml-2.0 \
......
PLUGIN := shotwell-publishing
PKGS := \
PLUGIN_PKGS := \
gtk+-3.0 \
libsoup-2.4 \
libxml-2.0 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment