Attachment #237609 for bug #327013

View | Details | Raw Unified | Return to bug 327013
Collapse All | Expand All




	FixedKeyFile.vapi \
	ExtendedPosix.vapi \
	LConv.vapi \
	libraw_r.vapi \
	gdk-none.vapi

RESOURCE_FILES = \

	LConv \
	gdk-none

# libraw is not listed (see note below); when libraw-config is no longer needed, it should be
# added to this list
EXT_PKGS = \
	atk \
	gdk-2.0 \

	gtk+-2.0 \
	libexif \
	sqlite3 \
	gexiv2 \
	libraw_r
LIBRAW_PKG = \
	libraw

ifdef LINUX
EXT_PKGS += \

	gdk-x11-2.0
endif

# libraw is handled separately (see note below); when libraw-config is no longer needed, the version
# should be added to this list
EXT_PKG_VERSIONS = \
	gee-1.0 >= 0.5.0 \
	gtk+-2.0 >= 2.18.0 \
	libexif >= 0.6.16 \
	sqlite3 >= 3.5.9 \
	gexiv2 >= 0.1.0 \
	libraw_r >= 0.9.0
LIBRAW_VERSION = \
	0.9.0

ifdef LINUX
EXT_PKG_VERSIONS += \

	dbus-glib-1 >= 0.80
endif

PKGS = $(EXT_PKGS) $(LOCAL_PKGS)

ifndef BUILD_DIR
BUILD_DIR=src

DIST_FILES = Makefile configure minver $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) \
	$(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) $(EXPANDED_ICON_FILES) \
	$(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_PO_FILES) po/shotwell.pot windows/install-deps \
	windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala

DIST_TAR = $(PROGRAM)-$(VERSION).tar
DIST_TAR_BZ2 = $(DIST_TAR).bz2

CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
endif

ifneq (,$(findstring fopenmp,$(shell pkg-config --cflags libraw_r)))
# If libraw is built with OpenMP support, we'll need this.
CFLAGS += -fopenmp
LIBRAW_CONFIG=./libraw-config
endif

ifdef WINDOWS
LIBRAW_CONFIG=./libraw-config --windows
endif

$(LANG_STAMP): $(EXPANDED_PO_FILES)

else ifdef EXT_PKGS
	@pkg-config --print-errors --exists $(EXT_PKGS)
endif
# Check for libraw manually, but not on Windows, where install-deps is used
ifndef WINDOWS
	@$(LIBRAW_CONFIG) --exists=$(LIBRAW_VERSION)
endif
endif
	@ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )
	mkdir -p $(BUILD_DIR)

	@

$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<

$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@

glade: lib$(PROGRAM).so

lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -shared -o $@

shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss
	iscc windows\winstall.iss

Return to bug 327013

Lines 126-132 Link Here

(-)Makefile.orig (-30 / +13 lines)
126	FixedKeyFile.vapi \	126	FixedKeyFile.vapi \
127	ExtendedPosix.vapi \	127	ExtendedPosix.vapi \
128	LConv.vapi \	128	LConv.vapi \
129	libraw.vapi \	129	libraw_r.vapi \
130	gdk-none.vapi	130	gdk-none.vapi
131		131
132	RESOURCE_FILES = \	132	RESOURCE_FILES = \
Lines 196-203 Link Here
196	LConv \	196	LConv \
197	gdk-none	197	gdk-none
198		198
199	# libraw is not listed (see note below); when libraw-config is no longer needed, it should be
200	# added to this list
201	EXT_PKGS = \	199	EXT_PKGS = \
202	atk \	200	atk \
203	gdk-2.0 \	201	gdk-2.0 \
Lines 205-214 Link Here
205	gtk+-2.0 \	203	gtk+-2.0 \
206	libexif \	204	libexif \
207	sqlite3 \	205	sqlite3 \
208	gexiv2	206	gexiv2 \
209		207	libraw_r
210	LIBRAW_PKG = \
211	libraw
212		208
213	ifdef LINUX	209	ifdef LINUX
214	EXT_PKGS += \	210	EXT_PKGS += \
Lines 223-239 Link Here
223	gdk-x11-2.0	219	gdk-x11-2.0
224	endif	220	endif
225		221
226	# libraw is handled separately (see note below); when libraw-config is no longer needed, the version
227	# should be added to this list
228	EXT_PKG_VERSIONS = \	222	EXT_PKG_VERSIONS = \
229	gee-1.0 >= 0.5.0 \	223	gee-1.0 >= 0.5.0 \
230	gtk+-2.0 >= 2.18.0 \	224	gtk+-2.0 >= 2.18.0 \
231	libexif >= 0.6.16 \	225	libexif >= 0.6.16 \
232	sqlite3 >= 3.5.9 \	226	sqlite3 >= 3.5.9 \
233	gexiv2 >= 0.1.0	227	gexiv2 >= 0.1.0 \
234		228	libraw_r >= 0.9.0
235	LIBRAW_VERSION = \
236	0.9.0
237		229
238	ifdef LINUX	230	ifdef LINUX
239	EXT_PKG_VERSIONS += \	231	EXT_PKG_VERSIONS += \
Lines 247-253 Link Here
247	dbus-glib-1 >= 0.80	239	dbus-glib-1 >= 0.80
248	endif	240	endif
249		241
250	PKGS = $(EXT_PKGS) $(LOCAL_PKGS) $(LIBRAW_PKG)	242	PKGS = $(EXT_PKGS) $(LOCAL_PKGS)
251		243
252	ifndef BUILD_DIR	244	ifndef BUILD_DIR
253	BUILD_DIR=src	245	BUILD_DIR=src
Lines 276-282 Link Here
276	DIST_FILES = Makefile configure minver $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) \	268	DIST_FILES = Makefile configure minver $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) \
277	$(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) $(EXPANDED_ICON_FILES) \	269	$(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) $(EXPANDED_ICON_FILES) \
278	$(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_PO_FILES) po/shotwell.pot windows/install-deps \	270	$(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_PO_FILES) po/shotwell.pot windows/install-deps \
279	windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala libraw-config	271	windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala
280		272
281	DIST_TAR = $(PROGRAM)-$(VERSION).tar	273	DIST_TAR = $(PROGRAM)-$(VERSION).tar
282	DIST_TAR_BZ2 = $(DIST_TAR).bz2	274	DIST_TAR_BZ2 = $(DIST_TAR).bz2
Lines 318-331 Link Here
318	CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE	310	CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
319	endif	311	endif
320		312
321	# Packaged libraw is not widely available, so we must fake what would be in its .pc file	313	ifneq (,$(findstring fopenmp,$(shell pkg-config --cflags libraw_r)))
322	# if not available.	314	# If libraw is built with OpenMP support, we'll need this.
323	ifdef LINUX	315	CFLAGS += -fopenmp
324	LIBRAW_CONFIG=./libraw-config
325	endif
326
327	ifdef WINDOWS
328	LIBRAW_CONFIG=./libraw-config --windows
329	endif	316	endif
330		317
331	$(LANG_STAMP): $(EXPANDED_PO_FILES)	318	$(LANG_STAMP): $(EXPANDED_PO_FILES)
Lines 447-456 Link Here
447	else ifdef EXT_PKGS	434	else ifdef EXT_PKGS
448	@pkg-config --print-errors --exists $(EXT_PKGS)	435	@pkg-config --print-errors --exists $(EXT_PKGS)
449	endif	436	endif
450	# Check for libraw manually, but not on Windows, where install-deps is used
451	ifndef WINDOWS
452	@$(LIBRAW_CONFIG) --exists=$(LIBRAW_VERSION)
453	endif
454	endif	437	endif
455	@ type msgfmt > /dev/null \|\| ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )	438	@ type msgfmt > /dev/null \|\| ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )
456	mkdir -p $(BUILD_DIR)	439	mkdir -p $(BUILD_DIR)
Lines 468-482 Link Here
468	@	451	@
469		452
470	$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile	453	$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
471	$(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $<	454	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<
472		455
473	$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)	456	$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
474	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@	457	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
475		458
476	glade: lib$(PROGRAM).so	459	glade: lib$(PROGRAM).so
477		460
478	lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)	461	lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
479	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@	462	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -shared -o $@
480		463
481	shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss	464	shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss
482	iscc windows\winstall.iss	465	iscc windows\winstall.iss