comparison make/sun/xawt/Makefile @ 1245:4fef42eb432c

Merge jdk7-b58 from main OpenJDK repository.
author kurt
date Wed, 20 May 2009 12:01:48 -0400
parents 0cbcc4bdf95a 06d6b91ec96f
children 2827e2508f5f
comparison
equal deleted inserted replaced
6:82bd611b2e77 7:fd5eaf085f17
45 include FILES_export_unix.gmk 45 include FILES_export_unix.gmk
46 AUTO_FILES_JAVA_DIRS = sun/awt/X11 46 AUTO_FILES_JAVA_DIRS = sun/awt/X11
47 AUTO_JAVA_PRUNE = WrapperGenerator.java 47 AUTO_JAVA_PRUNE = WrapperGenerator.java
48 48
49 LDFLAGS += -L$(OPENWIN_LIB) 49 LDFLAGS += -L$(OPENWIN_LIB)
50 ifeq ($(OS_NAME), netbsd)
51 LDFLAGS += -Wl,-R$(OPENWIN_LIB)
52 endif
50 53
51 ifeq ($(PLATFORM), linux) 54 ifeq ($(PLATFORM), linux)
52 LDFLAGS += -lpthread 55 LDFLAGS += -lpthread
56 dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
57 endif
58
59 ifeq ($(PLATFORM), bsd)
60 LDFLAGS += -pthread
53 dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) 61 dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
54 endif 62 endif
55 63
56 # Since this library will be living in a subdirectory below the other libraries 64 # Since this library will be living in a subdirectory below the other libraries
57 # we need to add an extra runpath so that libraries in the upper directory 65 # we need to add an extra runpath so that libraries in the upper directory
85 vpath %.c $(PLATFORM_SRC)/native/sun/awt/robot_child 93 vpath %.c $(PLATFORM_SRC)/native/sun/awt/robot_child
86 vpath %.c $(SHARE_SRC)/native/sun/java2d/opengl 94 vpath %.c $(SHARE_SRC)/native/sun/java2d/opengl
87 vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl 95 vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl
88 vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 96 vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11
89 97
90 OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ 98 ifeq ($(PLATFORM), bsd)
99 LIBDL=
100 else
101 LIBDL=-ldl
102 endif
103 OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 $(LIBDL) \
91 $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi 104 $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi
92 105
93 ifeq ($(PLATFORM), solaris) 106 ifeq ($(PLATFORM), solaris)
94 CPPFLAGS += -DFUNCPROTO=15 107 CPPFLAGS += -DFUNCPROTO=15
95 dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) 108 dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
96 endif 109 endif
97
98 CPPFLAGS += -I$(CUPS_HEADERS_PATH)
99 110
100 CPPFLAGS += -DXAWT -DXAWT_HACK \ 111 CPPFLAGS += -DXAWT -DXAWT_HACK \
101 -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \ 112 -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \
102 -I$(PLATFORM_SRC)/native/sun/awt \ 113 -I$(PLATFORM_SRC)/native/sun/awt \
103 -I$(PLATFORM_SRC)/native/sun/xawt \ 114 -I$(PLATFORM_SRC)/native/sun/xawt \
121 -I$(PLATFORM_SRC)/native/sun/awt/medialib \ 132 -I$(PLATFORM_SRC)/native/sun/awt/medialib \
122 -I$(PLATFORM_SRC)/native/sun/font \ 133 -I$(PLATFORM_SRC)/native/sun/font \
123 -I$(SHARE_SRC)/native/sun/awt \ 134 -I$(SHARE_SRC)/native/sun/awt \
124 -I$(PLATFORM_SRC)/native/sun/awt 135 -I$(PLATFORM_SRC)/native/sun/awt
125 136
137 CPPFLAGS += -I$(CUPS_HEADERS_PATH)
138
126 ifeq ($(PLATFORM), linux) 139 ifeq ($(PLATFORM), linux)
127 # Allows for builds on Debian GNU Linux, X11 is in a different place 140 # Allows for builds on Debian GNU Linux, X11 is in a different place
128 CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ 141 CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
129 -I/usr/include/X11/extensions \ 142 -I/usr/include/X11/extensions \
130 -I$(OPENWIN_HOME)/include 143 -I$(OPENWIN_HOME)/include
131 endif 144 endif
132 145
133 ifeq ($(PLATFORM), solaris) 146 ifeq ($(PLATFORM), solaris)
134 CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions 147 CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
148 endif
149
150 ifeq ($(PLATFORM), bsd)
151 CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions -I$(OPENWIN_HOME)/include
152 endif
153
154 ifneq ($(PLATFORM), windows)
155 CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
135 endif 156 endif
136 157
137 ifeq ($(MILESTONE), internal) 158 ifeq ($(MILESTONE), internal)
138 CPPFLAGS += -DINTERNAL_BUILD 159 CPPFLAGS += -DINTERNAL_BUILD
139 endif 160 endif