Hello,

here is a minimal patch (patches both src/Makefile.am and
src/Makefile.in) to fix the FTBFS.
It replaces the wrong usage of $binary_LDFLAGS with the correct
$binary_LDADD to pass additional libraries to link with.

I'm not sure if -lX11 should be kept in LDADD (from #554058) as I could
build the package without the -lX11 in LDADD in Ubuntu precise.

Michael
diff -u brightside-1.4.0/src/Makefile.in brightside-1.4.0/src/Makefile.in
--- brightside-1.4.0/src/Makefile.in
+++ brightside-1.4.0/src/Makefile.in
@@ -206,7 +206,7 @@
 	brightside.c brightside.h
 
 
-brightside_LDFLAGS = \
+brightside_LDADD = \
 	$(EXTRA_GNOME_LIBS)				\
 	$(ALSA_LIBS)					\
 	$(INTLLIBS)
@@ -225,7 +225,7 @@
 
 EGGFILES2 = eggtrayicon.h eggtrayicon.c
 
-brightside_properties_LDFLAGS = \
+brightside_properties_LDADD = \
 	$(EXTRA_GNOME_LIBS)			\
 	$(INTLLIBS)
 
@@ -287,14 +287,12 @@
 	$(am__objects_2) $(am__objects_3) $(am__objects_4) \
 	brightside-util.$(OBJEXT) brightside.$(OBJEXT)
 brightside_OBJECTS = $(am_brightside_OBJECTS)
-brightside_LDADD = $(LDADD) -lX11
 brightside_DEPENDENCIES =
 am_brightside_properties_OBJECTS = brightside-properties.$(OBJEXT) \
 	gconf-property-editor.$(OBJEXT) \
 	gconf-property-editor-marshal.$(OBJEXT) \
 	preview-file-selection.$(OBJEXT) custom-action.$(OBJEXT)
 brightside_properties_OBJECTS = $(am_brightside_properties_OBJECTS)
-brightside_properties_LDADD = $(LDADD) -lX11
 brightside_properties_DEPENDENCIES =
 
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
only in patch2:
unchanged:
--- brightside-1.4.0.orig/src/Makefile.am
+++ brightside-1.4.0/src/Makefile.am
@@ -36,7 +36,7 @@
 	brightside-util.c brightside-util.h			\
 	brightside.c brightside.h
 
-brightside_LDFLAGS =						\
+brightside_LDADD =						\
 	$(EXTRA_GNOME_LIBS)				\
 	$(ALSA_LIBS)					\
 	$(INTLLIBS)
@@ -53,7 +53,7 @@
 
 EGGFILES2 = eggtrayicon.h eggtrayicon.c
 
-brightside_properties_LDFLAGS = 			\
+brightside_properties_LDADD = 			\
 	$(EXTRA_GNOME_LIBS)			\
 	$(INTLLIBS)
 

Reply via email to