Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

General cleanup.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@47265 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
briano%netscape.com
1999-09-14 02:51:42 +00:00
parent b242b2d838
commit 1be96e2703
30 changed files with 471 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/modules/libimg/Makefile.in
View File

@@ -22,10 +22,11 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = $(PNGDIR) public public_com src gifcom pngcom jpgcom
ifndef MOZ_NATIVE_PNG
DIRS = png
PNGDIR = png
endif
DIRS += public public_com src gifcom pngcom jpgcom
include $(topsrcdir)/config/rules.mk

31
mozilla/modules/libimg/gifcom/Makefile.in
View File

@@ -14,9 +14,6 @@
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
ifndef MOZ_JAVA
LOCAL_JMC_SUBDIR = .
endif
DEPTH = ../../..
topsrcdir = @top_srcdir@
@@ -28,26 +25,26 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = nsgif
IS_COMPONENT = 1
LOCAL_INCLUDES = -I$(srcdir)
EXTRA_LIBS =
REQUIRES = util img gif xpcom img
CPPSRCS = \
gif.cpp \
nsGIFModule.cpp \
nsGIFDecoder.cpp \
dllcompat.cpp \
$(NULL)
gif.cpp \
nsGIFModule.cpp \
nsGIFDecoder.cpp \
dllcompat.cpp \
$(NULL)
LOCAL_INCLUDES = -I$(srcdir)
REQUIRES += util img gif xpcom img
EXTRA_LIBS = $(NSPR_LIBS)
EXTRA_LIBS += $(NSPR_LIBS)
ifndef MOZ_JAVA
LOCAL_JMC_SUBDIR = .
endif
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH), Linux)
DEFINES += -D_BSD_SOURCE
DEFINES += -D_BSD_SOURCE
endif

33
mozilla/modules/libimg/jpgcom/Makefile.in
View File

@@ -14,9 +14,6 @@
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
ifndef MOZ_JAVA
LOCAL_JMC_SUBDIR = .
endif
DEPTH = ../../..
topsrcdir = @top_srcdir@
@@ -28,28 +25,28 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = nsjpg
IS_COMPONENT = 1
LOCAL_INCLUDES = -I$(srcdir)
EXTRA_LIBS =
REQUIRES += util jpeg xpcom img
CPPSRCS = \
jpeg.cpp \
nsJPGDecoder.cpp \
nsJPGCallback.cpp \
dllcompat.cpp \
$(NULL)
jpeg.cpp \
nsJPGDecoder.cpp \
nsJPGCallback.cpp \
dllcompat.cpp \
$(NULL)
LOCAL_INCLUDES = -I$(srcdir)
REQUIRES += util jpeg xpcom img
EXTRA_DSO_LDOPTS = $(JPEG_LIBS)
EXTRA_DSO_LDOPTS += $(JPEG_LIBS)
EXTRA_LIBS = $(NSPR_LIBS)
EXTRA_LIBS += $(NSPR_LIBS)
ifndef MOZ_JAVA
LOCAL_JMC_SUBDIR = .
endif
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH), Linux)
DEFINES += -D_BSD_SOURCE
DEFINES += -D_BSD_SOURCE
endif

50
mozilla/modules/libimg/png/Makefile.in
View File

@@ -13,49 +13,51 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
#
DEPTH = ../../..
topsrcdir = @top_srcdir@
VPATH = @srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = png
LIBRARY_NAME = png
CSRCS = png.c \
pngerror.c \
pngget.c \
pngmem.c \
pngpread.c \
pngread.c \
pngrio.c \
pngrutil.c \
pngset.c \
pngtrans.c \
pngwio.c \
pngwrite.c \
pngwtran.c \
pngrtran.c \
pngwutil.c \
$(NULL)
REQUIRES = util
EXPORTS = png.h pngconf.h
CSRCS = \
png.c \
pngerror.c \
pngget.c \
pngmem.c \
pngpread.c \
pngread.c \
pngrio.c \
pngrutil.c \
pngset.c \
pngtrans.c \
pngwio.c \
pngwrite.c \
pngwtran.c \
pngrtran.c \
pngwutil.c \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXPORTS = png.h pngconf.h
REQUIRES = util
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
LOCAL_INCLUDES = -I$(srcdir)
ifndef MOZ_NATIVE_ZLIB
REQUIRES += zlib
EXTRA_DSO_LDOPTS = -L$(DIST)/bin -lzlib
endif
LOCAL_INCLUDES = -I$(srcdir)
# need static lib for the components to link with
override NO_SHARED_LIB=1
override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk

36
mozilla/modules/libimg/pngcom/Makefile.in
View File

@@ -14,9 +14,6 @@
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
ifndef MOZ_JAVA
LOCAL_JMC_SUBDIR = .
endif
DEPTH = ../../..
topsrcdir = @top_srcdir@
@@ -26,31 +23,30 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = nspng
IS_COMPONENT = 1
IS_COMPONENT = 1
LOCAL_INCLUDES = -I$(srcdir)
EXTRA_LIBS =
REQUIRES = util png zlib xpcom img
CPPSRCS = \
ipng.cpp \
nsPNGDecoder.cpp \
nsPNGCallback.cpp \
dllcompat.cpp \
$(NULL)
ipng.cpp \
nsPNGDecoder.cpp \
nsPNGCallback.cpp \
dllcompat.cpp \
$(NULL)
LOCAL_INCLUDES = -I$(srcdir)
REQUIRES += util png zlib xpcom img
EXTRA_DSO_LDOPTS = $(PNG_LIBS) $(ZLIB_LIBS)
EXTRA_DSO_LDOPTS += $(PNG_LIBS)
EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
EXTRA_LIBS = $(NSPR_LIBS)
EXTRA_LIBS += $(NSPR_LIBS)
ifndef MOZ_JAVA
LOCAL_JMC_SUBDIR = .
endif
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH), Linux)
DEFINES += -D_BSD_SOURCE
DEFINES += -D_BSD_SOURCE
endif

29
mozilla/modules/libimg/public/Makefile.in
View File

@@ -15,11 +15,6 @@
# Reserved.
#
ifndef MOZ_JAVA
LOCAL_JMC_SUBDIR = .
endif
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
@@ -29,12 +24,26 @@ include $(DEPTH)/config/autoconf.mk
MODULE = img
EXPORTS = \
il_types.h \
ni_pixmp.h \
libimg.h \
il_icons.h \
il_strm.h \
il_util.h \
ilINetContext.h \
ilIURL.h \
ilINetReader.h \
ilIImageRenderer.h \
ilISystemServices.h \
dummy_nc.h \
$(NULL)
EXPORTS = il_types.h ni_pixmp.h libimg.h il_icons.h il_strm.h il_util.h \
ilINetContext.h ilIURL.h ilINetReader.h ilIImageRenderer.h \
ilISystemServices.h dummy_nc.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
ifndef MOZ_JAVA
LOCAL_JMC_SUBDIR = .
endif
include $(topsrcdir)/config/rules.mk

26
mozilla/modules/libimg/public_com/Makefile.in
View File

@@ -15,11 +15,6 @@
# Reserved.
#
ifndef MOZ_JAVA
LOCAL_JMC_SUBDIR = .
endif
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
@@ -29,13 +24,22 @@ include $(DEPTH)/config/autoconf.mk
MODULE = img
# XXX nsImgDCallbk.h should go into libimg/src instead of being here
EXPORTS = il.h dllcompat.h if_struct.h il_utilp.h \
nsIImgDecoder.h nsIImgDCallbk.h \
nsImgDCallbk.h \
$(NULL)
EXPORTS = \
il.h \
dllcompat.h \
if_struct.h \
il_utilp.h \
nsIImgDecoder.h \
nsIImgDCallbk.h \
nsImgDCallbk.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
ifndef MOZ_JAVA
LOCAL_JMC_SUBDIR = .
endif
include $(topsrcdir)/config/rules.mk

39
mozilla/modules/libimg/src/Makefile.in
View File

@@ -14,9 +14,6 @@
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
ifndef MOZ_JAVA
LOCAL_JMC_SUBDIR = .
endif
DEPTH = ../../..
topsrcdir = @top_srcdir@
@@ -28,32 +25,32 @@ include $(DEPTH)/config/autoconf.mk
MODULE = img
LIBRARY_NAME = img_s
LOCAL_INCLUDES = -I$(srcdir)
REQUIRES = util img xpcom
CPPSRCS = \
ilNetReader.cpp \
color.cpp \
colormap.cpp \
dither.cpp \
if.cpp \
ilclient.cpp \
il_util.cpp \
scale.cpp \
$(NULL)
ilNetReader.cpp \
color.cpp \
colormap.cpp \
dither.cpp \
if.cpp \
ilclient.cpp \
il_util.cpp \
scale.cpp \
xpcompat.cpp \
$(NULL)
LOCAL_INCLUDES = -I$(srcdir)
CPPSRCS += xpcompat.cpp \
$(NULL)
ifndef MOZ_JAVA
LOCAL_JMC_SUBDIR = .
endif
REQUIRES += util img xpcom
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
MKSHLIB :=
override NO_SHARED_LIB=1
override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH), Linux)
DEFINES += -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
DEFINES += -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
endif