[master] Revised scripts/makefile.linux to make the same files as configure,

except for libpng.la and libpng14.la.  Many other scripts to be fixed soon.

ANNOUNCE

@@ -33,6 +33,8 @@ version 1.4.1beta01 [January 6, 2010]
     KNOWNBUG, and libpng.la (Robert Schwebel).
   Revised Makefile.am and Makefile.in to make libpng.so.14, libpng.sl.14,
     and libpng.14.dylib links in the installed library directory.
+  Revised scripts/makefile.linux to make the same files as configure,
+    except for libpng.la and libpng14.la.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

CHANGES

@@ -2465,6 +2465,8 @@ version 1.4.1beta01 [January 6, 2010]
     KNOWNBUG, and libpng.la (Robert Schwebel).
   Revised Makefile.am and Makefile.in to make libpng.so.14, libpng.sl.14,
     and libpng.14.dylib links in the installed library directory.
+  Revised scripts/makefile.linux to make the same files as configure,
+    except for libpng.la and libpng14.la.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

scripts/makefile.linux

@@ -1,5 +1,5 @@
 # makefile for libpng.a and libpng14.so on Linux ELF with gcc
-# Copyright (C) 1998, 1999, 2002, 2006, 2008 Greg Roelofs and
+# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010 Greg Roelofs and
 # Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
@@ -10,16 +10,12 @@
 # Library name:
 LIBNAME = libpng14
 PNGMAJ = 14
-PNGMIN = 1.4.1beta01
-PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
 LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOVER=$(LIBNAME).so.$(PNGVER)
 OLDSO=libpng.so
 OLDSOMAJ=libpng.so.14
-OLDSOVER=libpng.so.14.$(PNGMIN)
 
 # Utilities:
 AR_RC=ar rc
@@ -114,16 +110,8 @@ libpng-config:
 $(LIBSO): $(LIBSOMAJ)
 	$(LN_SF) $(LIBSOMAJ) $(LIBSO)
 
-$(LIBSOMAJ): $(LIBSOVER)
+$(LIBSOMAJ): $(OBJSDLL)
-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
+	$(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL)
-
-$(LIBSOVER): $(OBJSDLL)
-	$(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL)
-
-$(OLDSOVER): $(OBJSDLL)
-	$(CC) -shared -Wl,-soname,$(OLDSOMAJ) \
-	-o $(OLDSOVER) \
-	$(OBJSDLL)
 
 pngtest: pngtest.o $(LIBSO)
 	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -157,23 +145,18 @@ install-static: install-headers libpng.a
 	-@$(RM_F) $(DL)/libpng.a
 	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBSOVER) libpng.pc \
+install-shared: install-headers $(LIBSOMAJ) libpng.pc
-	$(OLDSOVER)
 	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)
+	-@$(RM_F) $(DL)/$(LIBSO)
 	-@$(RM_F) $(DL)/$(LIBSOMAJ)
 	-@$(RM_F) $(DL)/$(OLDSO)
 	-@$(RM_F) $(DL)/$(OLDSOMAJ)
-	-@$(RM_F) $(DL)/$(OLDSOVER)*
+	cp $(LIBSOMAJ) $(DL)
-	cp $(LIBSOVER) $(DL)
+	(cd $(DL);
-	cp $(OLDSOVER) $(DL)
+	$(LN_SF) $(LIBSOMAJ) $(LIBSO)
-	chmod 755 $(DL)/$(LIBSOVER)
+	$(LN_SF) $(LIBSOMAJ) $(OLDSOMAJ)
-	chmod 755 $(DL)/$(OLDSOVER)
+	$(LN_SF) $(LIBSO) $(OLDSO))
-	(cd $(DL); \
+
-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
-	$(LN_SF) $(LIBSOMAJ) $(LIBSO))
 	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
 	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
 	-@$(RM_F) $(DL)/pkgconfig/libpng.pc
@@ -225,7 +208,6 @@ test-installed:
 clean:
 	$(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
 	$(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
-	$(OLDSOVER) \
 	libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO