diff options
| author | Glenn Randers-Pehrson <glennrp@shaggy.simplesystems.org> | 2010-01-06 23:11:53 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp@shaggy.simplesystems.org> | 2010-01-06 23:11:53 -0600 |
| commit | 772b72139aabc2f6a9f8a642d05314563bd75c84 (patch) | |
| tree | faf7f9e12031869f499757cc822974b0a21f549d /scripts/makefile.sco | |
| parent | 6e6a844bafca69b64728a5844b478c85d45cc1fe (diff) | |
| download | libpng-772b72139aabc2f6a9f8a642d05314563bd75c84.tar.gz | |
[master] Revised the makefiles to install the same files and symbolic
links as configure, except for libpng.la and libpng14.la.
Diffstat (limited to 'scripts/makefile.sco')
| -rw-r--r-- | scripts/makefile.sco | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/scripts/makefile.sco b/scripts/makefile.sco index d747f4024..bb1ac849e 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,16 +12,11 @@ # 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: CC=cc @@ -101,17 +96,10 @@ libpng-config: $(LIBSO): $(LIBSOMAJ) $(LN_SF) $(LIBSOMAJ) $(LIBSO) -$(LIBSOMAJ): $(LIBSOVER) - $(LN_SF) $(LIBSOVER) $(LIBSOMAJ) - -$(LIBSOVER): $(OBJSDLL) - $(CC) -G -Wl,-h,$(LIBSOMAJ) -o $(LIBSOVER) \ +$(LIBSOMAJ): $(OBJSDLL) + $(CC) -G -Wl,-h,$(LIBSOMAJ) -o $(LIBSOMAJ) \ $(OBJSDLL) -$(OLDSOVER): $(OBJSDLL) - $(CC) -G -Wl,-h,$(OLDSOMAJ) -o $(OLDSOVER) \ - $(OBJSDLL) - pngtest: pngtest.o $(LIBSO) LD_RUN_PATH=.:$(ZLIBLIB) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) @@ -136,23 +124,16 @@ 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 \ - $(OLDSOVER) +install-shared: install-headers $(LIBSOMAJ) libpng.pc -@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 $(LIBSOVER) $(DL) - cp $(OLDSOVER) $(DL) - chmod 755 $(DL)/$(LIBSOVER) - chmod 755 $(DL)/$(OLDSOVER) - (cd $(DL); \ - $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \ - $(LN_SF) $(OLDSOMAJ) $(OLDSO); \ - $(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO)) + cp $(LIBSOMAJ) $(DL) + (cd $(DL); + $(LN_SF) $(LIBSOMAJ) $(LIBSO) + $(LN_SF) $(LIBSO) $(OLDSO)) + -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc @@ -204,7 +185,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 |