Attachment #244949 for bug #334821




++ Makefile 

	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 \

	glib-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 \
	glib-2.0 >= 2.24.0 \
	libexif >= 0.6.16 \
	sqlite3 >= 3.5.9 \
	gexiv2 >= 0.2.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 \
	$(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES)

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

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 334821

Line Link Here

(-)file_not_specified_in_diff (-31 / +14 lines)
0	-- Makefile.orig	0	++ Makefile
Lines 135-141 Link Here
135	FixedKeyFile.vapi \	135	FixedKeyFile.vapi \
136	ExtendedPosix.vapi \	136	ExtendedPosix.vapi \
137	LConv.vapi \	137	LConv.vapi \
138	libraw.vapi \	138	libraw_r.vapi \
139	gdk-none.vapi	139	gdk-none.vapi
140		140
141	RESOURCE_FILES = \	141	RESOURCE_FILES = \
Lines 260-267 Link Here
260	LConv \	260	LConv \
261	gdk-none	261	gdk-none
262		262
263	# libraw is not listed (see note below); when libraw-config is no longer needed, it should be
264	# added to this list
265	EXT_PKGS = \	263	EXT_PKGS = \
266	atk \	264	atk \
267	gdk-2.0 \	265	gdk-2.0 \
Lines 270-279 Link Here
270	glib-2.0 \	268	glib-2.0 \
271	libexif \	269	libexif \
272	sqlite3 \	270	sqlite3 \
273	gexiv2	271	gexiv2 \
274		272	libraw_r
275	LIBRAW_PKG = \
276	libraw
277		273
278	ifdef LINUX	274	ifdef LINUX
279	EXT_PKGS += \	275	EXT_PKGS += \
Lines 288-305 Link Here
288	gdk-x11-2.0	284	gdk-x11-2.0
289	endif	285	endif
290		286
291	# libraw is handled separately (see note below); when libraw-config is no longer needed, the version
292	# should be added to this list
293	EXT_PKG_VERSIONS = \	287	EXT_PKG_VERSIONS = \
294	gee-1.0 >= 0.5.0 \	288	gee-1.0 >= 0.5.0 \
295	gtk+-2.0 >= 2.18.0 \	289	gtk+-2.0 >= 2.18.0 \
296	glib-2.0 >= 2.24.0 \	290	glib-2.0 >= 2.24.0 \
297	libexif >= 0.6.16 \	291	libexif >= 0.6.16 \
298	sqlite3 >= 3.5.9 \	292	sqlite3 >= 3.5.9 \
299	gexiv2 >= 0.2.0	293	gexiv2 >= 0.2.0 \
300		294	libraw_r >= 0.9.0
301	LIBRAW_VERSION = \
302	0.9.0
303		295
304	ifdef LINUX	296	ifdef LINUX
305	EXT_PKG_VERSIONS += \	297	EXT_PKG_VERSIONS += \
Lines 313-319 Link Here
313	dbus-glib-1 >= 0.80	305	dbus-glib-1 >= 0.80
314	endif	306	endif
315		307
316	PKGS = $(EXT_PKGS) $(LOCAL_PKGS) $(LIBRAW_PKG)	308	PKGS = $(EXT_PKGS) $(LOCAL_PKGS)
317		309
318	ifndef BUILD_DIR	310	ifndef BUILD_DIR
319	BUILD_DIR=src	311	BUILD_DIR=src
Lines 344-350 Link Here
344	DIST_FILES = Makefile configure minver $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) \	336	DIST_FILES = Makefile configure minver $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) \
345	$(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) $(EXPANDED_ICON_FILES) \	337	$(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) $(EXPANDED_ICON_FILES) \
346	$(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_PO_FILES) po/shotwell.pot windows/install-deps \	338	$(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_PO_FILES) po/shotwell.pot windows/install-deps \
347	windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala libraw-config \	339	windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala \
348	$(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES)	340	$(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES)
349		341
350	DIST_TAR = $(PROGRAM)-$(VERSION).tar	342	DIST_TAR = $(PROGRAM)-$(VERSION).tar
Lines 387-400 Link Here
387	CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE	379	CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
388	endif	380	endif
389		381
390	# Packaged libraw is not widely available, so we must fake what would be in its .pc file	382	ifneq (,$(findstring fopenmp,$(shell pkg-config --cflags libraw_r)))
391	# if not available.	383	# If libraw is built with OpenMP support, we'll need this.
392	ifdef LINUX	384	CFLAGS += -fopenmp
393	LIBRAW_CONFIG=./libraw-config
394	endif
395
396	ifdef WINDOWS
397	LIBRAW_CONFIG=./libraw-config --windows
398	endif	385	endif
399		386
400	$(LANG_STAMP): $(EXPANDED_PO_FILES)	387	$(LANG_STAMP): $(EXPANDED_PO_FILES)
Lines 525-534 Link Here
525	else ifdef EXT_PKGS	512	else ifdef EXT_PKGS
526	@pkg-config --print-errors --exists $(EXT_PKGS)	513	@pkg-config --print-errors --exists $(EXT_PKGS)
527	endif	514	endif
528	# Check for libraw manually, but not on Windows, where install-deps is used
529	ifndef WINDOWS
530	@$(LIBRAW_CONFIG) --exists=$(LIBRAW_VERSION)
531	endif
532	endif	515	endif
533	@ type msgfmt > /dev/null \|\| ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )	516	@ type msgfmt > /dev/null \|\| ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )
534	mkdir -p $(BUILD_DIR)	517	mkdir -p $(BUILD_DIR)
Lines 546-560 Link Here
546	@	529	@
547		530
548	$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile	531	$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
549	$(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $<	532	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<
550		533
551	$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)	534	$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
552	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@	535	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
553		536
554	glade: lib$(PROGRAM).so	537	glade: lib$(PROGRAM).so
555		538
556	lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)	539	lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
557	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@	540	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -shared -o $@
558		541
559	shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss	542	shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss
560	iscc windows\winstall.iss	543	iscc windows\winstall.iss