70f8a04567
- add dependecy to iconv as source used iconv directly
39 lines
1.2 KiB
Text
39 lines
1.2 KiB
Text
--- GNUmakefile.orig 2011-06-01 09:31:59.000000000 +0200
|
|
+++ GNUmakefile 2012-02-18 12:33:58.000000000 +0100
|
|
@@ -8,7 +8,6 @@
|
|
|
|
# fixup flags
|
|
CFLAGS += -DVERSION='"$(VERSION)"' -I$(srcdir)
|
|
-CFLAGS += -Wno-pointer-sign
|
|
|
|
# default target
|
|
all: build
|
|
@@ -43,7 +42,7 @@
|
|
HAVE_GLIBC := $(call ac_func,fopencookie)
|
|
HAVE_STRCASESTR := $(call ac_func,strcasestr)
|
|
HAVE_LIBPCD := $(call ac_lib,pcd_open,pcd)
|
|
-HAVE_LIBUNGIF := $(call ac_lib,DGifOpenFileName,ungif)
|
|
+HAVE_LIBUNGIF := $(call ac_lib,DGifOpenFileName,gif)
|
|
HAVE_LIBPNG := $(call ac_lib,png_read_info,png,-lz)
|
|
HAVE_LIBTIFF := $(call ac_lib,TIFFOpen,tiff)
|
|
HAVE_LIBWEBP := $(call ac_lib,WebPDecodeRGBA,webp)
|
|
@@ -87,7 +86,7 @@
|
|
TIFF_LDLIBS := -ltiff
|
|
WEBP_LDLIBS := -lwebp
|
|
PCD_LDLIBS := -lpcd
|
|
-UNGIF_LDLIBS := -lungif
|
|
+UNGIF_LDLIBS := -lgif
|
|
SANE_LDLIBS := -lsane
|
|
CURL_LDLIBS := -lcurl
|
|
LIRC_LDLIBS := -llirc_client
|
|
@@ -144,8 +143,8 @@
|
|
OBJS_IDA += $(call ac_lib_mkvar,$(ida_libs),OBJS)
|
|
|
|
# for X11 + Motif
|
|
-ida : CFLAGS += -I/usr/X11R6/include
|
|
-ida : LDFLAGS += -L/usr/X11R6/$(LIB)
|
|
+ida : CFLAGS += -I$(LOCALBASE)/include
|
|
+ida : LDFLAGS += -L$(LOCALBASE)/$(LIB)
|
|
ida : LDLIBS += -lXm -lXpm -lXt -lXext -lX11
|
|
|
|
# jpeg/exif libs
|