summaryrefslogtreecommitdiff
path: root/scripts/makefile.openbsd
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2019-06-10 15:31:49 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-10 15:31:49 -0700
commit490afb6c027627b58763a986e1b464d85814080e (patch)
tree478f3db238be7e08885ac80ac8ef1be9935441bb /scripts/makefile.openbsd
parent2c58cd950f0cbbc337e91fc2ee184cb7039eef74 (diff)
parentaa0ce810a62b165c39abf6252c5fec107716a2fe (diff)
Merge "Merge tag 'v1.6.37' into HEAD" am: 7794b22253
am: aa0ce810a6 Change-Id: I100bb2612d1d9df7b2dfed94a1e39bf6a1271c89
Diffstat (limited to 'scripts/makefile.openbsd')
-rw-r--r--scripts/makefile.openbsd18
1 files changed, 8 insertions, 10 deletions
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index b32ea61a2..ad5ffb3a3 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -11,14 +11,16 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 16
-SHLIB_MINOR= 1.6.34
+SHLIB_MINOR= 1.6.37
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c \
pngwio.c pngwrite.c pngwtran.c pngwutil.c
-
HDRS= png.h pngconf.h pnglibconf.h
+MAN= libpng.3 libpngpf.3 png.5
+DOCS= ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO \
+ libpng-manual.txt
CFLAGS+= -W -Wall
CPPFLAGS+= -I${.CURDIR}
@@ -27,22 +29,18 @@ NOPROFILE= Yes
CLEANFILES+= pngtest.o pngtest pnglibconf.h
-MAN= libpng.3 libpngpf.3 png.5
-DOCS= ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \
- libpng-manual.txt
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT= scripts/pnglibconf.h.prebuilt
.c.o:
- $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
+ ${CC} -c ${CPPFLAGS} ${CFLAGS} -o $@ $<
-pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- cp $(PNGLIBCONF_H_PREBUILT) $@
+pnglibconf.h: ${PNGLIBCONF_H_PREBUILT}
+ cp ${PNGLIBCONF_H_PREBUILT} $@
pngtest.o: pngtest.c
- ${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
+ ${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
pngtest: pngtest.o
${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} -L${.OBJDIR} -lpng -lz -lm