diff -aur nspluginwrapper-1.2.2/Makefile nspluginwrapper-1.2.2-new/Makefile --- nspluginwrapper-1.2.2/Makefile 2009-01-02 16:54:10.000000000 +0800 +++ nspluginwrapper-1.2.2-new/Makefile 2009-06-26 20:20:20.866502278 +0800 @@ -41,6 +41,8 @@ STRIP_OPT = -s endif +USE_SYSTEM_LIBS = 1 + LN_S = ln -sf ifeq ($(LD_soname),) @@ -79,6 +81,11 @@ ARCH_32 = $(ARCH) ifeq ($(biarch), yes) ARCH_32 = $(TARGET_ARCH) +endif + +ifneq (1, $(USE_SYSTEM_LIBS)) + +ifeq ($(biarch), yes) LSB_LIBS = $(LSB_OBJ_DIR)/libc.so $(LSB_OBJ_DIR)/libgcc_s_32.so LSB_LIBS += $(LSB_CORE_STUBS:%=$(LSB_OBJ_DIR)/%.so) LSB_LIBS += $(LSB_CORE_STATIC_STUBS:%=$(LSB_OBJ_DIR)/%.a) @@ -92,6 +99,7 @@ LSB_CORE_STUBS = $(shell cat $(LSB_SRC_DIR)/core_filelist) LSB_CORE_STATIC_STUBS = $(shell cat $(LSB_SRC_DIR)/core_static_filelist) LSB_DESKTOP_STUBS = $(shell cat $(LSB_SRC_DIR)/desktop_filelist) +endif ifeq (i386,$(TARGET_ARCH)) TARGET_ELF_ARCH = elf32-i386 @@ -116,10 +124,15 @@ npviewer_OBJECTS = $(npviewer_RAWSRCS:%.c=npviewer-%.o) ifeq ($(biarch),yes) npviewer_CFLAGS = $(CFLAGS_32) +ifneq (1, $(USE_SYSTEM_LIBS)) npviewer_CFLAGS += -I$(LSB_INC_DIR) npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0 npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0 npviewer_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) +else +npviewer_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 glib-2.0) +npviewer_LDFLAGS = $(LDFLAGS_32) +endif npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt else npviewer_CFLAGS += $(GTK_CFLAGS) @@ -156,8 +169,11 @@ libxpcom_OBJECTS = $(libxpcom_RAWSRCS:%.c=libxpcom-%.o) libxpcom_CFLAGS = $(PIC_CFLAGS) ifeq ($(biarch),yes) +libxpcom_LDFLAGS = $(LDFLAGS_32) +ifneq (1, $(USE_SYSTEM_LIBS)) libxpcom_CFLAGS += -I$(LSB_INC_DIR) -libxpcom_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) +libxpcom_LDFLAGS += -L$(LSB_OBJ_DIR) +endif endif libnoxshm_LIBRARY = libnoxshm.so @@ -166,8 +182,11 @@ libnoxshm_OBJECTS = $(libnoxshm_RAWSRCS:%.c=libnoxshm-%.o) libnoxshm_CFLAGS = $(PIC_CFLAGS) ifeq ($(biarch),yes) +libnoxshm_LDFLAGS = $(LDFLAGS_32) +ifneq (1, $(USE_SYSTEM_LIBS)) libnoxshm_CFLAGS += -I$(LSB_INC_DIR) -libnoxshm_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR) +libnoxshm_LDFLAGS += -L$(LSB_OBJ_DIR) +endif endif npconfig_PROGRAM = npconfig @@ -230,6 +249,7 @@ FILES += $(wildcard tests/*.html) FILES += $(wildcard tests/*.c tests/*.h) FILES += $(wildcard npapi/*.h npapi/nspr/*.h npapi/nspr/obsolete/*.h) +ifneq (1, $(USE_SYSTEM_LIBS)) FILES += $(LSB_TOP_DIR)/headers/core_filelist FILES += $(addprefix $(LSB_TOP_DIR)/headers/,$(shell cat $(LSB_TOP_DIR)/headers/core_filelist)) FILES += $(LSB_TOP_DIR)/headers/desktop_filelist @@ -243,12 +263,15 @@ FILES += $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_CORE_STATIC_STUBS)) FILES += $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_DESKTOP_STUBS)) FILES += $(patsubst %,$(LSB_SRC_DIR)/%.Version,$(LSB_DESKTOP_STUBS)) +endif all: $(TARGETS) clean: rm -f $(TARGETS) *.o *.os +ifneq (1, $(USE_SYSTEM_LIBS)) rm -rf $(LSB_OBJ_DIR) +endif distclean: clean rm -f config-host.* config.*