Browse Source

Bugfix: Reorder LDADD and such for priority

Luke Dashjr 11 years ago
parent
commit
1122f4d868
1 changed files with 14 additions and 7 deletions
  1. 14 7
      Makefile.am

+ 14 - 7
Makefile.am

@@ -48,16 +48,25 @@ else
 bin_SCRIPTS = start-bfgminer.sh
 bin_SCRIPTS = start-bfgminer.sh
 endif
 endif
 
 
-bfgminer_LDFLAGS	= $(PTHREAD_FLAGS)
-bfgminer_LDADD	= $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ \
+# first, our own stuff
+bfgminer_LDADD    = lib/libgnu.a ccan.bfg/libccan.a
+bfgminer_LDFLAGS  =
+bfgminer_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/ccan-upstream
+
+# second, potentially embedded libs
+bfgminer_LDADD    += $(libbase58_LIBS)   $(libblkmaker_LIBS)
+bfgminer_CPPFLAGS += $(libbase58_CFLAGS) $(libblkmaker_CFLAGS)
+
+# finally, everything else
+bfgminer_LDFLAGS += $(PTHREAD_FLAGS)
+bfgminer_LDADD   += $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ \
 		  @NCURSES_LIBS@ @PDCURSES_LIBS@ @WS2_LIBS@ \
 		  @NCURSES_LIBS@ @PDCURSES_LIBS@ @WS2_LIBS@ \
 		  @UDEV_LIBS@ @LIBUSB_LIBS@ @MM_LIBS@ @RT_LIBS@ \
 		  @UDEV_LIBS@ @LIBUSB_LIBS@ @MM_LIBS@ @RT_LIBS@ \
-		  @MATH_LIBS@ lib/libgnu.a ccan.bfg/libccan.a
-bfgminer_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @LIBUSB_CFLAGS@ @LIBCURL_CFLAGS@
+                    $(MATH_LIBS)
+bfgminer_CPPFLAGS += @LIBUSB_CFLAGS@ @LIBCURL_CFLAGS@
 
 
 bfgminer_CPPFLAGS += -DCGMINER_PREFIX='"$(pkgdatadir)"'
 bfgminer_CPPFLAGS += -DCGMINER_PREFIX='"$(pkgdatadir)"'
 
 
-bfgminer_CPPFLAGS += -I$(top_srcdir)/ccan-upstream
 bfgminer_CPPFLAGS += @JANSSON_CFLAGS@
 bfgminer_CPPFLAGS += @JANSSON_CFLAGS@
 bfgminer_CPPFLAGS += $(PTHREAD_FLAGS)
 bfgminer_CPPFLAGS += $(PTHREAD_FLAGS)
 bfgminer_CPPFLAGS += $(NCURSES_CPPFLAGS)
 bfgminer_CPPFLAGS += $(NCURSES_CPPFLAGS)
@@ -83,8 +92,6 @@ bfgminer_SOURCES += version.h
 BUILT_SOURCES = version.h
 BUILT_SOURCES = version.h
 
 
 SUBDIRS += $(libbase58_SUBDIRS) $(libblkmaker_SUBDIRS)
 SUBDIRS += $(libbase58_SUBDIRS) $(libblkmaker_SUBDIRS)
-bfgminer_LDADD += $(libbase58_LIBS) $(libblkmaker_LIBS)
-bfgminer_CPPFLAGS += $(libbase58_CFLAGS) $(libblkmaker_CFLAGS)
 EXTRA_bfgminer_DEPENDENCIES += $(libbase58_EXTRADEPS) $(libblkmaker_EXTRADEPS)
 EXTRA_bfgminer_DEPENDENCIES += $(libbase58_EXTRADEPS) $(libblkmaker_EXTRADEPS)
 @BUNDLED_LIB_RULES@
 @BUNDLED_LIB_RULES@