sam
/
nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: use lowercase for internal macros 

ref: 971f5d6694
This commit is contained in:
NRK 2022-05-26 06:08:59 +06:00 committed by N-R-K
parent 6c30fb22cc
commit c713186ce9
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -13,16 +13,18 @@ lib_gif_1 = -lgif
lib_webp_0 = lib_webp_0 =
lib_webp_1 = -lwebpdemux -lwebp lib_webp_1 = -lwebpdemux -lwebp
CPPFLAGS = -D_XOPEN_SOURCE=700 $(INCLUDES) \ nsxiv_cppflags = -D_XOPEN_SOURCE=700 \
-DHAVE_LIBGIF=$(HAVE_LIBGIF) -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) \ -DHAVE_LIBGIF=$(HAVE_LIBGIF) -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) \
-DHAVE_LIBWEBP=$(HAVE_LIBWEBP) -DHAVE_LIBFONTS=$(HAVE_LIBFONTS) \ -DHAVE_LIBWEBP=$(HAVE_LIBWEBP) -DHAVE_LIBFONTS=$(HAVE_LIBFONTS) \
-DHAVE_INOTIFY=$(HAVE_INOTIFY) $(inc_fonts_$(HAVE_LIBFONTS)) -DHAVE_INOTIFY=$(HAVE_INOTIFY) $(inc_fonts_$(HAVE_LIBFONTS)) \
$(CPPFLAGS)
NSXIV_LDLIBS = -lImlib2 -lX11 \ nsxiv_ldlibs = -lImlib2 -lX11 \
$(lib_exif_$(HAVE_LIBEXIF)) $(lib_gif_$(HAVE_LIBGIF)) \ $(lib_exif_$(HAVE_LIBEXIF)) $(lib_gif_$(HAVE_LIBGIF)) \
$(lib_webp_$(HAVE_LIBWEBP)) $(lib_fonts_$(HAVE_LIBFONTS)) $(lib_webp_$(HAVE_LIBWEBP)) $(lib_fonts_$(HAVE_LIBFONTS)) \
$(LDLIBS)
OBJS = autoreload.o commands.o image.o main.o options.o \ objs = autoreload.o commands.o image.o main.o options.o \
thumbs.o util.o window.o thumbs.o util.o window.o
.SUFFIXES: .SUFFIXES:
@ -30,15 +32,15 @@ OBJS = autoreload.o commands.o image.o main.o options.o \
all: nsxiv all: nsxiv
nsxiv: $(OBJS) nsxiv: $(objs)
@echo "LINK $@" @echo "LINK $@"
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS) $(NSXIV_LDLIBS) $(CC) $(LDFLAGS) -o $@ $(objs) $(nsxiv_ldlibs)
.c.o: .c.o:
@echo "CC $@" @echo "CC $@"
$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< $(CC) $(CFLAGS) $(nsxiv_cppflags) -c -o $@ $<
$(OBJS): Makefile config.mk nsxiv.h config.h commands.h $(objs): Makefile config.mk nsxiv.h config.h commands.h
options.o: version.h options.o: version.h
window.o: icon/data.h window.o: icon/data.h

2
config.mk
View File

@ -33,4 +33,4 @@ ICONS = 16x16.png 32x32.png 48x48.png 64x64.png 128x128.png
# inc_fonts_bsd_0 = # inc_fonts_bsd_0 =
# inc_fonts_bsd_1 = -I/usr/X11R6/include/freetype2 # inc_fonts_bsd_1 = -I/usr/X11R6/include/freetype2
# LDLIBS = -lz -L/usr/local/lib -L/usr/X11R6/lib $(lib_fonts_bsd_$(HAVE_LIBFONTS)) # LDLIBS = -lz -L/usr/local/lib -L/usr/X11R6/lib $(lib_fonts_bsd_$(HAVE_LIBFONTS))
# INCLUDES = -I/usr/local/include -I/usr/X11R6/include $(inc_fonts_bsd_$(HAVE_LIBFONTS)) # CPPFLAGS = -I/usr/local/include -I/usr/X11R6/include $(inc_fonts_bsd_$(HAVE_LIBFONTS))