Lines 41-46
Link Here
|
41 |
STRIP_OPT = -s |
41 |
STRIP_OPT = -s |
42 |
endif |
42 |
endif |
43 |
|
43 |
|
|
|
44 |
USE_SYSTEM_LIBS = 1 |
45 |
|
44 |
LN_S = ln -sf |
46 |
LN_S = ln -sf |
45 |
|
47 |
|
46 |
ifeq ($(LD_soname),) |
48 |
ifeq ($(LD_soname),) |
Lines 79-84
Link Here
|
79 |
ARCH_32 = $(ARCH) |
81 |
ARCH_32 = $(ARCH) |
80 |
ifeq ($(biarch), yes) |
82 |
ifeq ($(biarch), yes) |
81 |
ARCH_32 = $(TARGET_ARCH) |
83 |
ARCH_32 = $(TARGET_ARCH) |
|
|
84 |
endif |
85 |
|
86 |
ifneq (1, $(USE_SYSTEM_LIBS)) |
87 |
|
88 |
ifeq ($(biarch), yes) |
82 |
LSB_LIBS = $(LSB_OBJ_DIR)/libc.so $(LSB_OBJ_DIR)/libgcc_s_32.so |
89 |
LSB_LIBS = $(LSB_OBJ_DIR)/libc.so $(LSB_OBJ_DIR)/libgcc_s_32.so |
83 |
LSB_LIBS += $(LSB_CORE_STUBS:%=$(LSB_OBJ_DIR)/%.so) |
90 |
LSB_LIBS += $(LSB_CORE_STUBS:%=$(LSB_OBJ_DIR)/%.so) |
84 |
LSB_LIBS += $(LSB_CORE_STATIC_STUBS:%=$(LSB_OBJ_DIR)/%.a) |
91 |
LSB_LIBS += $(LSB_CORE_STATIC_STUBS:%=$(LSB_OBJ_DIR)/%.a) |
Lines 92-97
Link Here
|
92 |
LSB_CORE_STUBS = $(shell cat $(LSB_SRC_DIR)/core_filelist) |
99 |
LSB_CORE_STUBS = $(shell cat $(LSB_SRC_DIR)/core_filelist) |
93 |
LSB_CORE_STATIC_STUBS = $(shell cat $(LSB_SRC_DIR)/core_static_filelist) |
100 |
LSB_CORE_STATIC_STUBS = $(shell cat $(LSB_SRC_DIR)/core_static_filelist) |
94 |
LSB_DESKTOP_STUBS = $(shell cat $(LSB_SRC_DIR)/desktop_filelist) |
101 |
LSB_DESKTOP_STUBS = $(shell cat $(LSB_SRC_DIR)/desktop_filelist) |
|
|
102 |
endif |
95 |
|
103 |
|
96 |
ifeq (i386,$(TARGET_ARCH)) |
104 |
ifeq (i386,$(TARGET_ARCH)) |
97 |
TARGET_ELF_ARCH = elf32-i386 |
105 |
TARGET_ELF_ARCH = elf32-i386 |
Lines 116-125
Link Here
|
116 |
npviewer_OBJECTS = $(npviewer_RAWSRCS:%.c=npviewer-%.o) |
124 |
npviewer_OBJECTS = $(npviewer_RAWSRCS:%.c=npviewer-%.o) |
117 |
ifeq ($(biarch),yes) |
125 |
ifeq ($(biarch),yes) |
118 |
npviewer_CFLAGS = $(CFLAGS_32) |
126 |
npviewer_CFLAGS = $(CFLAGS_32) |
|
|
127 |
ifneq (1, $(USE_SYSTEM_LIBS)) |
119 |
npviewer_CFLAGS += -I$(LSB_INC_DIR) |
128 |
npviewer_CFLAGS += -I$(LSB_INC_DIR) |
120 |
npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0 |
129 |
npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0 |
121 |
npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0 |
130 |
npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0 |
122 |
npviewer_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) |
131 |
npviewer_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) |
|
|
132 |
else |
133 |
npviewer_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 glib-2.0) |
134 |
npviewer_LDFLAGS = $(LDFLAGS_32) |
135 |
endif |
123 |
npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt |
136 |
npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt |
124 |
else |
137 |
else |
125 |
npviewer_CFLAGS += $(GTK_CFLAGS) |
138 |
npviewer_CFLAGS += $(GTK_CFLAGS) |
Lines 156-163
Link Here
|
156 |
libxpcom_OBJECTS = $(libxpcom_RAWSRCS:%.c=libxpcom-%.o) |
169 |
libxpcom_OBJECTS = $(libxpcom_RAWSRCS:%.c=libxpcom-%.o) |
157 |
libxpcom_CFLAGS = $(PIC_CFLAGS) |
170 |
libxpcom_CFLAGS = $(PIC_CFLAGS) |
158 |
ifeq ($(biarch),yes) |
171 |
ifeq ($(biarch),yes) |
|
|
172 |
libxpcom_LDFLAGS = $(LDFLAGS_32) |
173 |
ifneq (1, $(USE_SYSTEM_LIBS)) |
159 |
libxpcom_CFLAGS += -I$(LSB_INC_DIR) |
174 |
libxpcom_CFLAGS += -I$(LSB_INC_DIR) |
160 |
libxpcom_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) |
175 |
libxpcom_LDFLAGS += -L$(LSB_OBJ_DIR) |
|
|
176 |
endif |
161 |
endif |
177 |
endif |
162 |
|
178 |
|
163 |
libnoxshm_LIBRARY = libnoxshm.so |
179 |
libnoxshm_LIBRARY = libnoxshm.so |
Lines 166-173
Link Here
|
166 |
libnoxshm_OBJECTS = $(libnoxshm_RAWSRCS:%.c=libnoxshm-%.o) |
182 |
libnoxshm_OBJECTS = $(libnoxshm_RAWSRCS:%.c=libnoxshm-%.o) |
167 |
libnoxshm_CFLAGS = $(PIC_CFLAGS) |
183 |
libnoxshm_CFLAGS = $(PIC_CFLAGS) |
168 |
ifeq ($(biarch),yes) |
184 |
ifeq ($(biarch),yes) |
|
|
185 |
libnoxshm_LDFLAGS = $(LDFLAGS_32) |
186 |
ifneq (1, $(USE_SYSTEM_LIBS)) |
169 |
libnoxshm_CFLAGS += -I$(LSB_INC_DIR) |
187 |
libnoxshm_CFLAGS += -I$(LSB_INC_DIR) |
170 |
libnoxshm_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) |
188 |
libnoxshm_LDFLAGS += -L$(LSB_OBJ_DIR) |
|
|
189 |
endif |
171 |
endif |
190 |
endif |
172 |
|
191 |
|
173 |
npconfig_PROGRAM = npconfig |
192 |
npconfig_PROGRAM = npconfig |
Lines 230-235
Link Here
|
230 |
FILES += $(wildcard tests/*.html) |
249 |
FILES += $(wildcard tests/*.html) |
231 |
FILES += $(wildcard tests/*.c tests/*.h) |
250 |
FILES += $(wildcard tests/*.c tests/*.h) |
232 |
FILES += $(wildcard npapi/*.h npapi/nspr/*.h npapi/nspr/obsolete/*.h) |
251 |
FILES += $(wildcard npapi/*.h npapi/nspr/*.h npapi/nspr/obsolete/*.h) |
|
|
252 |
ifneq (1, $(USE_SYSTEM_LIBS)) |
233 |
FILES += $(LSB_TOP_DIR)/headers/core_filelist |
253 |
FILES += $(LSB_TOP_DIR)/headers/core_filelist |
234 |
FILES += $(addprefix $(LSB_TOP_DIR)/headers/,$(shell cat $(LSB_TOP_DIR)/headers/core_filelist)) |
254 |
FILES += $(addprefix $(LSB_TOP_DIR)/headers/,$(shell cat $(LSB_TOP_DIR)/headers/core_filelist)) |
235 |
FILES += $(LSB_TOP_DIR)/headers/desktop_filelist |
255 |
FILES += $(LSB_TOP_DIR)/headers/desktop_filelist |
Lines 243-254
Link Here
|
243 |
FILES += $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_CORE_STATIC_STUBS)) |
263 |
FILES += $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_CORE_STATIC_STUBS)) |
244 |
FILES += $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_DESKTOP_STUBS)) |
264 |
FILES += $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_DESKTOP_STUBS)) |
245 |
FILES += $(patsubst %,$(LSB_SRC_DIR)/%.Version,$(LSB_DESKTOP_STUBS)) |
265 |
FILES += $(patsubst %,$(LSB_SRC_DIR)/%.Version,$(LSB_DESKTOP_STUBS)) |
|
|
266 |
endif |
246 |
|
267 |
|
247 |
all: $(TARGETS) |
268 |
all: $(TARGETS) |
248 |
|
269 |
|
249 |
clean: |
270 |
clean: |
250 |
rm -f $(TARGETS) *.o *.os |
271 |
rm -f $(TARGETS) *.o *.os |
|
|
272 |
ifneq (1, $(USE_SYSTEM_LIBS)) |
251 |
rm -rf $(LSB_OBJ_DIR) |
273 |
rm -rf $(LSB_OBJ_DIR) |
|
|
274 |
endif |
252 |
|
275 |
|
253 |
distclean: clean |
276 |
distclean: clean |
254 |
rm -f config-host.* config.* |
277 |
rm -f config-host.* config.* |