More Makefile.lite fixes
authorErik de Castro Lopo <erikd@mega-nerd.com>
Wed, 21 Dec 2016 05:14:46 +0000 (16:14 +1100)
committerErik de Castro Lopo <erikd@mega-nerd.com>
Wed, 21 Dec 2016 05:14:50 +0000 (16:14 +1100)
Patch-from: Robert Kausch <robert.kausch@freac.org>

build/config.mk
src/share/Makefile.am
src/utils/flactimer/Makefile.am

index 6771db8..376982d 100644 (file)
@@ -42,15 +42,9 @@ endif
 ifndef PROC
     ifeq ($(findstring Windows,$(OS)),Windows)
         PROC := i386 # failsafe
-        USE_ICONV := 0
-        USE_LANGINFO_CODESET := 0
-        ifeq (mingw32,$(shell gcc -dumpmachine)) # MinGW (mainline): mingw32
-            USE_FSEEKO := 0
-        endif
         # ifeq ($(findstring i686,$(shell gcc -dumpmachine)),i686) # MinGW-w64: i686-w64-mingw32
         ifeq ($(findstring x86_64,$(shell gcc -dumpmachine)),x86_64) # MinGW-w64: x86_64-w64-mingw32
             PROC := x86_64
-            F_PIC :=
         endif
     else
         ifeq ($(shell uname -p),amd64)
@@ -75,6 +69,15 @@ ifeq ($(OS),Linux)
     USE_ICONV := 0
 endif
 
+ifeq ($(findstring Windows,$(OS)),Windows)
+    F_PIC :=
+    USE_ICONV := 0
+    USE_LANGINFO_CODESET := 0
+    ifeq (mingw32,$(shell gcc -dumpmachine)) # MinGW (mainline): mingw32
+        USE_FSEEKO := 0
+    endif
+endif
+
 debug    : BUILD = debug
 valgrind : BUILD = debug
 release  : BUILD = release
index d6bb187..82d0fc9 100644 (file)
@@ -46,6 +46,7 @@ EXTRA_DIST = \
        utf8/utf8_static.vcproj \
        utf8/utf8_static.vcxproj \
        utf8/utf8_static.vcxproj.filters \
+       win_utf8_io/Makefile.lite \
        win_utf8_io/win_utf8_io_static.vcproj \
        win_utf8_io/win_utf8_io_static.vcxproj \
        win_utf8_io/win_utf8_io_static.vcxproj.filters
index 0dfe050..3d9e91f 100644 (file)
@@ -17,6 +17,7 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 EXTRA_DIST = \
+       Makefile.lite \
        flactimer.vcproj \
        flactimer.vcxproj \
        flactimer.vcxproj.filters \