switch_LDFLAGS_LDADD.diff 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. Description: Switch LDADD with LDFLAGS
  2. This change is to move the objects before the libs. to fix an FTBFS when
  3. --as-needed is passed to gcc.
  4. Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>
  5. Forwarded: yes
  6. --- drawtiming-0.7.1.orig/src/Makefile.am
  7. +++ drawtiming-0.7.1/src/Makefile.am
  8. @@ -3,7 +3,7 @@
  9. bin_PROGRAMS = drawtiming
  10. drawtiming_SOURCES = main.cc globals.h parser.yy scanner.ll timing.cc timing.h
  11. -drawtiming_LDFLAGS = @MAGICK_LIBS@
  12. +drawtiming_LDADD = @MAGICK_LIBS@
  13. EXTRA_DIST = parser.h
  14. BUILT_SOURCES = parser.h
  15. --- drawtiming-0.7.1.orig/src/Makefile.in
  16. +++ drawtiming-0.7.1/src/Makefile.in
  17. @@ -51,7 +51,7 @@
  18. am_drawtiming_OBJECTS = main.$(OBJEXT) parser.$(OBJEXT) \
  19. scanner.$(OBJEXT) timing.$(OBJEXT)
  20. drawtiming_OBJECTS = $(am_drawtiming_OBJECTS)
  21. -drawtiming_LDADD = $(LDADD)
  22. +drawtiming_LDADD = @MAGICK_LIBS@ $(LDADD)
  23. DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  24. depcomp = $(SHELL) $(top_srcdir)/depcomp
  25. am__depfiles_maybe = depfiles
  26. @@ -159,7 +159,7 @@
  27. AM_CXXFLAGS = @MAGICK_CFLAGS@ -DYYDEBUG=1
  28. AM_YFLAGS = -d
  29. drawtiming_SOURCES = main.cc globals.h parser.yy scanner.ll timing.cc timing.h
  30. -drawtiming_LDFLAGS = @MAGICK_LIBS@
  31. +drawtiming_LDFLAGS = @LDFLAGS@
  32. EXTRA_DIST = parser.h
  33. BUILT_SOURCES = parser.h
  34. all: $(BUILT_SOURCES)