Commit 04df3462 authored by Jim Nelson's avatar Jim Nelson

#3282: Problem linking shotwell-publishing on 64-bit Maverick fixed.

parent 797ca0b6
......@@ -119,7 +119,6 @@ RESOURCE_FILES = \
trash.ui \
offline.ui \
media.ui \
yandex_publish_model.glade \
shotwell.glade \
set_background_dialog.glade \
search_bar.ui
......@@ -189,7 +188,6 @@ ICON_FILES = \
filter-videos.png \
filter-flagged.png
HELP_FILES = \
edit-adjustments.page \
edit-crop.page \
......@@ -326,7 +324,7 @@ UNITIZE_STAMP := $(UNITIZE_DIR)/.unitized
PLUGINS_DIR := plugins
PLUGINS_SO := $(foreach plugin,$(PLUGINS),$(PLUGINS_DIR)/$(plugin)/$(plugin).so)
EXTRA_PLUGINS_SO := $(foreach plugin,$(EXTRA_PLUGINS),$(PLUGINS_DIR)/$(plugin)/$(plugin).so)
PLUGINS_DIST_FILES = `$(MAKE) --directory=plugins --no-print-directory listfiles`
PLUGINS_DIST_FILES := `$(MAKE) --directory=plugins --no-print-directory listfiles`
EXPANDED_PO_FILES := $(foreach po,$(SUPPORTED_LANGUAGES),po/$(po).po)
EXPANDED_SRC_FILES := $(UNITIZED_SRC_FILES) $(foreach src,$(UNUNITIZED_SRC_FILES),src/$(src)) \
......@@ -437,13 +435,15 @@ package:
.PHONY: dist
dist:
mkdir -p $(PROGRAM)-$(VERSION)
cp --parents $(DIST_FILES) $(PROGRAM)-$(VERSION)
cp --parents --preserve $(DIST_FILES) $(PROGRAM)-$(VERSION)
tar --bzip2 -cvf $(DIST_TAR_BZ2) $(PROGRAM)-$(VERSION)
tar --gzip -cvf $(DIST_TAR_GZ) $(PROGRAM)-$(VERSION)
rm -rf $(PROGRAM)-$(VERSION)
distclean: clean
rm -f configure.mk
rm -f $(DIST_TAR_BZ2)
rm -f $(DIST_TAR_GZ)
@$(MAKE) --directory=plugins distclean
.PHONY: install
......
......@@ -17,27 +17,51 @@ HEADER_FILES := ../shotwell-plugin-dev-1.0.vapi ../shotwell-plugin-dev-1.0.h \
include ../plugins.mk
# automatically include the shotwell-plugin-dev-1.0 package
# automatically include shotwell-plugin-dev-1.0's dependencies
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)
# automatically include the Resources.vala common file
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)` -O2 -g -pipe -fPIC -nostdlib \
-export-dynamic
LDFLAGS := `pkg-config --print-errors --libs $(EXT_PKGS)` $(LDFLAGS)
DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"shotwell"'
all: $(PLUGIN).so
$(PLUGIN).so: $(SRC_FILES) $(MAKE_FILES) $(HEADER_FILES)
$(VALAC) -g --enable-checking --fatal-warnings --save-temps --main=dummy_main --vapidir=../ \
$(foreach pkg,$(PKGS),--pkg=$(pkg)) \
-X -I../.. -X --shared -X -fPIC -X -D_VERSION='"$(PLUGINS_VERSION)"' \
-X -DGETTEXT_PACKAGE='"shotwell"' $(SRC_FILES) -o $@
.stamp: $(SRC_FILES) $(MAKE_FILES) $(HEADER_FILES)
$(VALAC) -g --enable-checking --fatal-warnings --save-temps --compile \
--vapidir=../ $(foreach pkg,$(PKGS),--pkg=$(pkg)) \
-X -I../.. -X -fPIC \
$(foreach dfn,$(DEFINES),-X $(dfn)) \
$(SRC_FILES)
@touch .stamp
$(CFILES): .stamp
@
$(OFILES): %.o: %.c $(CFILES)
$(CC) -c $(CFLAGS) $(DEFINES) -I../.. $(CFILES)
$(PLUGIN).so: $(OFILES)
$(CC) $(CFLAGS) $(LDFLAGS) $(OFILES) -I../.. -shared -o $@
.PHONY: cleantemps
cleantemps:
@rm -f $(notdir $(SRC_FILES:.vala=.c)) $(notdir $(SRC_FILES:.vala=.o))
@rm -f .stamp
.PHONY: clean
clean: cleantemps
@rm -f $(PLUGIN).so
@rm -f $(PLUGIN).so $(OFILES) $(CFILES)
.PHONY: distclean
distclean: clean
......
......@@ -39,7 +39,3 @@ public Spit.Module? spit_entry_point(Spit.EntryPointParams *params) {
? new ShotwellPublishingExtraServices() : null;
}
// valac wants a default entry point, so valac gets a default entry point
private void dummy_main() {
}
......@@ -47,7 +47,3 @@ public Spit.Module? spit_entry_point(Spit.EntryPointParams *params) {
? new ShotwellPublishingCoreServices(params->module_file) : null;
}
// valac wants a default entry point, so valac gets a default entry point
private void dummy_main() {
}
......@@ -43,10 +43,6 @@ public Spit.Module? spit_entry_point(Spit.EntryPointParams *params) {
? new ShotwellTransitions(params->module_file) : null;
}
// This is here to keep valac happy.
private void dummy_main() {
}
// Base class for all transition descriptors in this module
public abstract class ShotwellTransitionDescriptor : Object, Spit.Pluggable, Spit.Transitions.Descriptor {
private const string ICON_FILENAME = "slideshow-plugin.png";
......
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