mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-28 13:21:28 +00:00
Move xprintutil source files into a separate static library. Bug 201633, Author=Roland.Mainz@informatik.med.uni-giessen.de, r=leaf
This commit is contained in:
smontagu%netscape.com
parent
ebdf775673
commit
24b099e7b1
@ -65,6 +65,9 @@ ifneq (,$(filter xlib,$(MOZ_WIDGET_TOOLKIT))$(MOZ_ENABLE_XLIB)$(MOZ_ENABLE_XPRIN
|
||||
DIRS += xlibrgb
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_XPRINT
|
||||
DIRS += xprintutil xprint
|
||||
endif
|
||||
ifdef MOZ_ENABLE_GTK
|
||||
DIRS += gtk
|
||||
endif
|
||||
@ -74,15 +77,10 @@ endif
|
||||
ifdef MOZ_ENABLE_XLIB
|
||||
DIRS += xlib
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_PHOTON
|
||||
DIRS += photon
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_XPRINT
|
||||
DIRS += xprint
|
||||
endif
|
||||
|
||||
CPPSRCS = \
|
||||
nsBlender.cpp \
|
||||
nsColor.cpp \
|
||||
|
||||
@ -54,6 +54,10 @@ ifdef SUNCTL
|
||||
REQUIRES += ctl
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_XPRINT
|
||||
REQUIRES += xprintutil
|
||||
endif
|
||||
|
||||
NATIVE_THEME_SUPPORT = 1
|
||||
|
||||
CSRCS = nsPrintdGTK.c
|
||||
@ -123,11 +127,6 @@ endif
|
||||
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_XPRINT
|
||||
XPU_LCSRCS = xprintutil.c
|
||||
CSRCS += $(XPU_LCSRCS)
|
||||
endif
|
||||
|
||||
GARBAGE += $(X11SHARED_LCPPSRCS) $(XPU_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
|
||||
|
||||
ifdef MOZ_ENABLE_FREETYPE2
|
||||
@ -162,6 +161,10 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_XPRINT
|
||||
EXTRA_DSO_LDOPTS += -lxprintutil
|
||||
endif
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)
|
||||
CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
|
||||
CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
|
||||
|
||||
@ -57,6 +57,10 @@ ifdef SUNCTL
|
||||
REQUIRES += ctl
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_XPRINT
|
||||
REQUIRES += xprintutil
|
||||
endif
|
||||
|
||||
# Code shared between GTK+, Xlib and Xprint gfx modules
|
||||
# (empty for now - but this will be filled soon...)
|
||||
X11SHARED_LCPPSRCS = \
|
||||
@ -83,15 +87,14 @@ ifdef HAVE_XIE
|
||||
CSRCS += XIE.c
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_XPRINT
|
||||
XPU_LCSRCS = xprintutil.c
|
||||
CSRCS += $(XPU_LCSRCS)
|
||||
endif
|
||||
|
||||
GARBAGE += $(X11SHARED_LCPPSRCS) $(XPU_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef MOZ_ENABLE_XPRINT
|
||||
EXTRA_DSO_LDOPTS += -lxprintutil
|
||||
endif
|
||||
|
||||
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_XLIB_LDFLAGS)
|
||||
CXXFLAGS += $(MOZ_XLIB_CFLAGS)
|
||||
|
||||
|
||||
@ -38,6 +38,8 @@ EXTRA_DSO_LIBS = gfxshared_s gkgfx
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
xlibrgb \
|
||||
xprintutil \
|
||||
widget \
|
||||
view \
|
||||
pref \
|
||||
@ -52,11 +54,6 @@ ifdef SUNCTL
|
||||
REQUIRES += ctl
|
||||
endif
|
||||
|
||||
CSRCS = \
|
||||
xprintutil.c \
|
||||
xprintutil_printtofile.c \
|
||||
$(NULL)
|
||||
|
||||
# Code shared between GTK+, Xlib and Xprint gfx modules
|
||||
# (empty for now - but this will be filled soon...)
|
||||
X11SHARED_LCPPSRCS = \
|
||||
@ -84,7 +81,6 @@ EXPORTS = \
|
||||
nsIDeviceContextXPrint.h \
|
||||
nsGfxXPrintCID.h \
|
||||
nsIDeviceContextSpecXPrint.h \
|
||||
xprintutil.h \
|
||||
$(NULL)
|
||||
|
||||
CXXFLAGS += $(MOZ_XPRINT_CFLAGS)
|
||||
@ -100,6 +96,7 @@ CXXFLAGS += $(TK_CFLAGS)
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(LIBS_DIR) \
|
||||
-lxlibrgb \
|
||||
-lxprintutil \
|
||||
$(EXTRA_DSO_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(MOZ_XPRINT_LDFLAGS) \
|
||||
@ -109,7 +106,6 @@ LOCAL_INCLUDES = \
|
||||
-I../.. \
|
||||
-I$(srcdir) \
|
||||
-I$(srcdir)/../xlib \
|
||||
-I$(srcdir)/../xlibrgb \
|
||||
-I$(srcdir)/../x11shared \
|
||||
-I$(srcdir)/.. \
|
||||
$(NULL)
|
||||
|
||||
45
gfx/src/xprintutil/Makefile.in
Normal file
45
gfx/src/xprintutil/Makefile.in
Normal file
@ -0,0 +1,45 @@
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public
|
||||
# License Version 1.1 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS
|
||||
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
# implied. See the License for the specific language governing
|
||||
# rights and limitations under the License.
|
||||
#
|
||||
# The Original Code is mozilla.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
|
||||
#
|
||||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = xprintutil
|
||||
LIBRARY_NAME = xprintutil
|
||||
FORCE_STATIC_LIB= 1
|
||||
|
||||
CSRCS = \
|
||||
xprintutil.c \
|
||||
xprintutil_printtofile.c
|
||||
|
||||
EXPORTS = xprintutil.h
|
||||
|
||||
CFLAGS += $(MOZ_XPRINT_CFLAGS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
DEFINES += -DUSE_MOZILLA_TYPES -DUSE_XPRINT
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user