diff options
| author | Haibo Huang <hhb@google.com> | 2019-06-10 15:25:51 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-10 15:25:51 -0700 |
| commit | aa0ce810a62b165c39abf6252c5fec107716a2fe (patch) | |
| tree | 478f3db238be7e08885ac80ac8ef1be9935441bb /scripts/makefile.linux | |
| parent | d22b72011118e2e00c01519ba79801804773ac07 (diff) | |
| parent | 7794b2225328b6423a98c2c8de2afa21e4783036 (diff) | |
Merge "Merge tag 'v1.6.37' into HEAD"
am: 7794b22253
Change-Id: Icd76c301afccd9c4afb39b0d27e84bf39512c81a
Diffstat (limited to 'scripts/makefile.linux')
| -rw-r--r-- | scripts/makefile.linux | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/makefile.linux b/scripts/makefile.linux index f61087ccf..f2d8beae2 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng16 PNGMAJ = 16 -RELEASE = 34 +RELEASE = 37 # Shared library names: LIBSO=$(LIBNAME).so @@ -50,8 +50,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # for pgcc version 2.95.1, -O3 is buggy; don't use it. CPPFLAGS=-I$(ZLIBINC) # -DPNG_DEBUG=5 -CFLAGS= -W -Wall -O3 -funroll-loops \ - $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 +CFLAGS=-W -Wall -O3 -funroll-loops $(ALIGN) # $(WARNMORE) -g LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng16 -lz -lm LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm @@ -222,7 +221,7 @@ clean: $(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \ libpng.pc pnglibconf.h -DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO +DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO writelock: chmod a-w *.[ch35] $(DOCS) scripts/* |