nsxivc713186
Makefile: use lowercase for internal macros
+12 −10
2 files changed
| @@ -13,16 +13,18 @@ lib_gif_1 = -lgif | |||
| 13 | 13 | lib_webp_0 = | |
| 14 | 14 | lib_webp_1 = -lwebpdemux -lwebp | |
| 15 | 15 | ||
| 16 | − | CPPFLAGS = -D_XOPEN_SOURCE=700 $(INCLUDES) \ | |
| 16 | + | nsxiv_cppflags = -D_XOPEN_SOURCE=700 \ | |
| 17 | 17 | -DHAVE_LIBGIF=$(HAVE_LIBGIF) -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) \ | |
| 18 | 18 | -DHAVE_LIBWEBP=$(HAVE_LIBWEBP) -DHAVE_LIBFONTS=$(HAVE_LIBFONTS) \ | |
| 19 | − | -DHAVE_INOTIFY=$(HAVE_INOTIFY) $(inc_fonts_$(HAVE_LIBFONTS)) | |
| 19 | + | -DHAVE_INOTIFY=$(HAVE_INOTIFY) $(inc_fonts_$(HAVE_LIBFONTS)) \ | |
| 20 | + | $(CPPFLAGS) | |
| 20 | 21 | ||
| 21 | − | NSXIV_LDLIBS = -lImlib2 -lX11 \ | |
| 22 | + | nsxiv_ldlibs = -lImlib2 -lX11 \ | |
| 22 | 23 | $(lib_exif_$(HAVE_LIBEXIF)) $(lib_gif_$(HAVE_LIBGIF)) \ | |
| 23 | − | $(lib_webp_$(HAVE_LIBWEBP)) $(lib_fonts_$(HAVE_LIBFONTS)) | |
| 24 | + | $(lib_webp_$(HAVE_LIBWEBP)) $(lib_fonts_$(HAVE_LIBFONTS)) \ | |
| 25 | + | $(LDLIBS) | |
| 24 | 26 | ||
| 25 | − | OBJS = autoreload.o commands.o image.o main.o options.o \ | |
| 27 | + | objs = autoreload.o commands.o image.o main.o options.o \ | |
| 26 | 28 | thumbs.o util.o window.o | |
| 27 | 29 | ||
| 28 | 30 | .SUFFIXES: | |
| @@ -30,15 +32,15 @@ OBJS = autoreload.o commands.o image.o main.o options.o \ | |||
| 30 | 32 | ||
| 31 | 33 | all: nsxiv | |
| 32 | 34 | ||
| 33 | − | nsxiv: $(OBJS) | |
| 35 | + | nsxiv: $(objs) | |
| 34 | 36 | @echo "LINK $@" | |
| 35 | − | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS) $(NSXIV_LDLIBS) | |
| 37 | + | $(CC) $(LDFLAGS) -o $@ $(objs) $(nsxiv_ldlibs) | |
| 36 | 38 | ||
| 37 | 39 | .c.o: | |
| 38 | 40 | @echo "CC $@" | |
| 39 | − | $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< | |
| 41 | + | $(CC) $(CFLAGS) $(nsxiv_cppflags) -c -o $@ $< | |
| 40 | 42 | ||
| 41 | − | $(OBJS): Makefile config.mk nsxiv.h config.h commands.h | |
| 43 | + | $(objs): Makefile config.mk nsxiv.h config.h commands.h | |
| 42 | 44 | options.o: version.h | |
| 43 | 45 | window.o: icon/data.h | |
| 44 | 46 | ||
| @@ -33,4 +33,4 @@ ICONS = 16x16.png 32x32.png 48x48.png 64x64.png 128x128.png | |||
| 33 | 33 | # inc_fonts_bsd_0 = | |
| 34 | 34 | # inc_fonts_bsd_1 = -I/usr/X11R6/include/freetype2 | |
| 35 | 35 | # LDLIBS = -lz -L/usr/local/lib -L/usr/X11R6/lib $(lib_fonts_bsd_$(HAVE_LIBFONTS)) | |
| 36 | − | # INCLUDES = -I/usr/local/include -I/usr/X11R6/include $(inc_fonts_bsd_$(HAVE_LIBFONTS)) | |
| 36 | + | # CPPFLAGS = -I/usr/local/include -I/usr/X11R6/include $(inc_fonts_bsd_$(HAVE_LIBFONTS)) | |