29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
|
Respect LDFLAGS when building C files. Bug #435048
|
||
|
|
Patch hasn't been sent upstream yet.
|
||
|
|
Index: shotwell-0.13.1/Makefile
|
||
|
|
===================================================================
|
||
|
|
--- shotwell-0.13.1.orig/Makefile
|
||
|
|
+++ shotwell-0.13.1/Makefile
|
||
|
|
@@ -697,7 +697,7 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
|
||
|
|
@
|
||
|
|
|
||
|
|
$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
|
||
|
|
- $(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<
|
||
|
|
+ $(CC) -c $(VALA_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
|
||
|
|
|
||
|
|
$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
|
||
|
|
$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
|
||
|
|
Index: shotwell-0.13.1/plugins/Makefile.plugin.mk
|
||
|
|
===================================================================
|
||
|
|
--- shotwell-0.13.1.orig/plugins/Makefile.plugin.mk
|
||
|
|
+++ shotwell-0.13.1/plugins/Makefile.plugin.mk
|
||
|
|
@@ -54,7 +54,7 @@ $(CFILES): .stamp
|
||
|
|
@
|
||
|
|
|
||
|
|
$(OFILES): %.o: %.c $(CFILES)
|
||
|
|
- $(CC) -c $(CFLAGS) $(DEFINES) -I../.. $(CFILES)
|
||
|
|
+ $(CC) -c $(CFLAGS) $(LDFLAGS) $(DEFINES) -I../.. $(CFILES)
|
||
|
|
|
||
|
|
$(PLUGIN).so: $(OFILES)
|
||
|
|
$(CC) $(CFLAGS) $(LDFLAGS) -shared $(OFILES) $(LIBS) -o $@
|