summaryrefslogtreecommitdiff
path: root/scripts/makefile.linux
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2002-09-17 23:38:46 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-04-06 16:07:30 -0500
commit5ff38d3e1625888719c3c173168e4792211c0089 (patch)
tree54f91b8546aa0ffb5c7bf108dd057224ed405edc /scripts/makefile.linux
parent865f4f073a692279c4aecbce7c9b9ed5a27372cf (diff)
downloadlibpng-5ff38d3e1625888719c3c173168e4792211c0089.tar.gz
Imported from libpng-1.2.5rc3.tarv1.2.5rc3
Diffstat (limited to 'scripts/makefile.linux')
-rw-r--r--scripts/makefile.linux12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index fbeb83bd2..e8596ec87 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -5,7 +5,7 @@
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.5rc2
+PNGMIN = 1.2.5rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc
@@ -83,9 +83,9 @@ libpng.pc:
libpng-config:
( cat scripts/libpng-config-head.in; \
echo prefix=\"$(prefix)\"; \
- echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo cflags=\"\"; \
- echo ldflags=\"-L$(LIBPATH) -Wl,-rpath,$(LIBPATH)\"; \
+ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+ echo L_opts=\"-L$(LIBPATH)\"; \
+ echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
echo libs=\"-lpng12 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config
@@ -187,9 +187,9 @@ install: install-static install-shared install-man install-config
test-installed:
$(CC) -I$(ZLIBINC) \
- `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+ `$(BINPATH)/libpng12-config --cflags` pngtest.c \
-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
- -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
+ -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
./pngtesti pngtest.png
clean: