From 8f99adbbbd7fe5ebfc7e4a80ca4a0da9b49d92bc Mon Sep 17 00:00:00 2001 From: Bert Date: Mon, 12 Sep 2011 12:16:10 +0200 Subject: [PATCH] Made XFLAGS & XLIBS macros only --- Makefile | 8 ++++++-- README.md | 9 ++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 38c037e..f1337b4 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,14 @@ -VERSION = git-20110911 +VERSION = git-20110912 CC = gcc CFLAGS = -Wall -pedantic -O2 LDFLAGS = LIBS = -lX11 -lImlib2 +XFLAGS = +XLIBS = + +DESTDIR = PREFIX = /usr/local MANPREFIX = $(PREFIX)/share/man @@ -17,8 +21,8 @@ options: @echo "sxiv build options:" @echo "CC = $(CC)" @echo "CFLAGS = $(CFLAGS)" - @echo "XFLAGS = $(XFLAGS)" @echo "LDFLAGS = $(LDFLAGS)" + @echo "XFLAGS = $(XFLAGS)" @echo "XLIBS = $(XLIBS)" @echo "PREFIX = $(PREFIX)" diff --git a/README.md b/README.md index 8d61e64..4cf51cf 100644 --- a/README.md +++ b/README.md @@ -74,16 +74,11 @@ enable the corresponding feature: files according to their EXIF tag | | | For instance, to enable GIF and EXIF support, the giflib and libexif libraries -need to be installed on your system and you either need to change the first -build command to: +need to be installed on your system and you need to change the first build +command to: $ make XFLAGS="-DGIF_SUPPORT -DEXIF_SUPPORT" XLIBS="-lgif -lexif" -Or you need to run the following commands before building sxiv: - - $ export XFLAGS="-DGIF_SUPPORT -DEXIF_SUPPORT" - $ export XLIBS="-lgif -lexif" - Usage ===== sxiv has two modes of operation: image and thumbnail mode. The default is