Removed unused variables MOZ_OJI & ENABLE_PICS.

Set module_CFLAGS to $(PUBLIC) instead of $(DIST)/public/module.
This commit is contained in:
cls%seawood.org 2000-01-11 04:56:23 +00:00
Родитель 5695508a59
Коммит 54b330f20a
1 изменённых файлов: 3 добавлений и 5 удалений

Просмотреть файл

@ -43,7 +43,6 @@ MOZ_GFX_TOOLKIT_LDFLAGS = -lgfx_$(MOZ_WIDGET_TOOLKIT) $(MOZ_XLIBRGB_LDFLAGS)
MOZ_WIDGET_TOOLKIT_LDFLAGS = -lwidget_$(MOZ_WIDGET_TOOLKIT)
MOZ_SECURITY = @MOZ_SECURITY@
MOZ_OJI = @MOZ_OJI@
MOZ_DEBUG = @MOZ_DEBUG@
MOZ_DEBUG_MODULES = @MOZ_DEBUG_MODULES@
MOZ_EXTENSIONS = @MOZ_EXTENSIONS@
@ -62,7 +61,6 @@ NO_NETSCAPE_SHARED = @NO_SHARED_LIB@
NO_STATIC_LIB = @NO_STATIC_LIB@
NO_NETSCAPE_STATIC = @NO_STATIC_LIB@
ENABLE_TESTS = @ENABLE_TESTS@
ENABLE_PICS = @ENABLE_PICS@
BUILD_IDLC = @BUILD_IDLC@
USE_IMPLICIT_ARCHIVE = @USE_IMPLICIT_ARCHIVE@
NEED_BASE_DLL_NAME_ALSO = @NEED_BASE_DLL_NAME_ALSO@
@ -176,7 +174,7 @@ JPEG_CFLAGS = @JPEG_CFLAGS@
JPEG_LIBS = @JPEG_LIBS@
JPEG_REQUIRES =
else
JPEG_CFLAGS = -I$(DIST)/public/jpeg
JPEG_CFLAGS = -I$(PUBLIC)
JPEG_LIBS = $(DIST)/lib/libjpeg.a
JPEG_REQUIRES = jpeg
endif
@ -186,7 +184,7 @@ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
ZLIB_REQUIRES =
else
ZLIB_CFLAGS = -I$(DIST)/public/zlib
ZLIB_CFLAGS = -I$(PUBLIC)
ZLIB_LIBS = $(DIST)/lib/libzlib.a
ZLIB_REQUIRES = zlib
endif
@ -196,7 +194,7 @@ PNG_CFLAGS = @PNG_CFLAGS@
PNG_LIBS = @PNG_LIBS@
PNG_REQUIRES =
else
PNG_CFLAGS = -I$(DIST)/public/png
PNG_CFLAGS = -I$(PUBLIC)
PNG_LIBS = $(DIST)/lib/libpng.a
PNG_REQUIRES = png
endif