fix library link order

diff --git a/src/flac/Makefile.lite b/src/flac/Makefile.lite
index 78d62a2..2246bed 100644 (file)
--- a/src/flac/Makefile.lite
+++ b/src/flac/Makefile.lite
@@ -24,16 +24,16 @@ topdir = ../..
 PROGRAM_NAME = flac
 ifeq ($(DARWIN_BUILD),yes)
 INCLUDES     = -I./include -I$(topdir)/include
-LIBS         = -lFLAC -lreplaygain -lgain_analysis -lgetopt -lutf8 -lc -lm
+LIBS         = -lreplaygain -lFLAC -lgain_analysis -lgetopt -lutf8 -lc -lm
 else
 #@@@ TODO: conditionalize ogg includes, defines, and -logg
 ifeq ($(SOLARIS_BUILD),yes)
 INCLUDES     = -I./include -I$(topdir)/include -I$(HOME)/local/include -DFLAC__HAS_OGG
-LIBS         = -lOggFLAC -lFLAC -lreplaygain -lgain_analysis -lgetopt -lutf8 -lm -L$(HOME)/local/lib -logg
+LIBS         = -lreplaygain -lOggFLAC -lFLAC -lgain_analysis -lgetopt -lutf8 -lm -L$(HOME)/local/lib -logg
 else
 #@@@ TODO: conditionalize ogg includes, defines, and -logg
 INCLUDES     = -I./include -I$(topdir)/include -I$(HOME)/local/include -DFLAC__HAS_OGG
-LIBS         = -lOggFLAC -lFLAC -lreplaygain -lgain_analysis -lgetopt -lutf8 -lm -L$(HOME)/local/lib -logg
+LIBS         = -lreplaygain -lOggFLAC -lFLAC -lgain_analysis -lgetopt -lutf8 -lm -L$(HOME)/local/lib -logg
 endif
 endif
 

diff --git a/src/flac/Makefile.vc b/src/flac/Makefile.vc
index 853ad6f..0e0ee0e 100644 (file)
--- a/src/flac/Makefile.vc
+++ b/src/flac/Makefile.vc
@@ -40,7 +40,7 @@ OBJS= $(C_FILES:.c=.obj)
 all: flac.exe\r
 \r
 flac.exe: $(OBJS)\r
-       link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) libOggFLAC.lib libFLAC.lib ogg_static.lib replaygain.lib gain_analysis.lib getopt.lib utf8.lib\r
+       link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) replaygain.lib libOggFLAC.lib libFLAC.lib ogg_static.lib gain_analysis.lib getopt.lib utf8.lib\r
 \r
 clean:\r
        -del *.obj *.pch\r

diff --git a/src/metaflac/Makefile.lite b/src/metaflac/Makefile.lite
index 7cddcce..280825e 100644 (file)
--- a/src/metaflac/Makefile.lite
+++ b/src/metaflac/Makefile.lite
@@ -23,7 +23,7 @@ topdir = ../..
 
 PROGRAM_NAME = metaflac
 INCLUDES     = -I./include -I$(topdir)/include
-LIBS         = -lFLAC -lreplaygain -lgain_analysis -lgetopt -lutf8 -lm
+LIBS         = -lreplaygain -lFLAC -lgain_analysis -lgetopt -lutf8 -lm
 
 OBJS = \
        main.o

diff --git a/src/metaflac/Makefile.vc b/src/metaflac/Makefile.vc
index 4b78603..a1c744a 100644 (file)
--- a/src/metaflac/Makefile.vc
+++ b/src/metaflac/Makefile.vc
@@ -33,7 +33,7 @@ OBJS= $(C_FILES:.c=.obj)
 all: metaflac.exe\r
 \r
 metaflac.exe: $(OBJS)\r
-       link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) libFLAC.lib replaygain.lib gain_analysis.lib getopt.lib utf8.lib\r
+       link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) replaygain.lib libFLAC.lib gain_analysis.lib getopt.lib utf8.lib\r
 \r
 clean:\r
        -del *.obj *.pch\r