Kaydet (Commit) 4821546a authored tarafından François Tigeot's avatar François Tigeot

Remove unused variable PACKAGE_LIB_DIR

üst d7647965
...@@ -51,7 +51,6 @@ EXE_EXT=.exe ...@@ -51,7 +51,6 @@ EXE_EXT=.exe
COPY=copy COPY=copy
SHAREDLIB_EXT=dll SHAREDLIB_EXT=dll
SHAREDLIB_OUT=$(OUT_BIN) SHAREDLIB_OUT=$(OUT_BIN)
PACKAGE_LIB_DIR=windows.plt
UNOPKG_PLATFORM=Windows UNOPKG_PLATFORM=Windows
OSEP=^< OSEP=^<
...@@ -133,18 +132,15 @@ PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)$(shell /usr/ccs/bin/elf ...@@ -133,18 +132,15 @@ PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)$(shell /usr/ccs/bin/elf
ifeq "$(PROCTYPE)" "sparc" ifeq "$(PROCTYPE)" "sparc"
PLATFORM=solsparc PLATFORM=solsparc
PACKAGE_LIB_DIR=solaris_sparc.plt
UNOPKG_PLATFORM=Solaris_SPARC UNOPKG_PLATFORM=Solaris_SPARC
JAVA_PROC_TYPE=sparc JAVA_PROC_TYPE=sparc
else else
ifeq "$(PROCTYPE)" "sparc64" ifeq "$(PROCTYPE)" "sparc64"
PLATFORM=solsparc PLATFORM=solsparc
PACKAGE_LIB_DIR=solaris_sparc64.plt
UNOPKG_PLATFORM=Solaris_SPARC64 UNOPKG_PLATFORM=Solaris_SPARC64
JAVA_PROC_TYPE=sparcv9 JAVA_PROC_TYPE=sparcv9
else else
PLATFORM=solintel PLATFORM=solintel
PACKAGE_LIB_DIR=solaris_x86.plt
UNOPKG_PLATFORM=Solaris_x86 UNOPKG_PLATFORM=Solaris_x86
JAVA_PROC_TYPE=i386 JAVA_PROC_TYPE=i386
endif endif
...@@ -243,24 +239,20 @@ ifneq (,$(findstring linux,$(PLATFORM))) ...@@ -243,24 +239,20 @@ ifneq (,$(findstring linux,$(PLATFORM)))
PROCTYPE := $(shell $(PRJ)/config.guess | cut -d "-" -f1 | sed -e 's/^i.86$$/i386/') PROCTYPE := $(shell $(PRJ)/config.guess | cut -d "-" -f1 | sed -e 's/^i.86$$/i386/')
PLATFORM=linux PLATFORM=linux
PACKAGE_LIB_DIR=linux_$(PROCTYPE).plt
UNOPKG_PLATFORM=Linux_$(PROCTYPE) UNOPKG_PLATFORM=Linux_$(PROCTYPE)
JAVA_PROC_TYPE=$(PROCTYPE) JAVA_PROC_TYPE=$(PROCTYPE)
ifeq "$(PROCTYPE)" "i386" ifeq "$(PROCTYPE)" "i386"
PACKAGE_LIB_DIR=linux_x86.plt
UNOPKG_PLATFORM=Linux_x86 UNOPKG_PLATFORM=Linux_x86
JAVA_PROC_TYPE=i386 JAVA_PROC_TYPE=i386
endif endif
ifeq "$(PROCTYPE)" "powerpc" ifeq "$(PROCTYPE)" "powerpc"
PACKAGE_LIB_DIR=linux_powerpc.plt
UNOPKG_PLATFORM=Linux_PowerPC UNOPKG_PLATFORM=Linux_PowerPC
JAVA_PROC_TYPE=ppc JAVA_PROC_TYPE=ppc
endif endif
ifeq "$(PROCTYPE)" "sparc" ifeq "$(PROCTYPE)" "sparc"
PACKAGE_LIB_DIR=linux_sparc.plt
UNOPKG_PLATFORM=Linux_SPARC UNOPKG_PLATFORM=Linux_SPARC
JAVA_PROC_TYPE=sparc JAVA_PROC_TYPE=sparc
endif endif
...@@ -376,16 +368,13 @@ PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1) ...@@ -376,16 +368,13 @@ PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
PLATFORM=macosx PLATFORM=macosx
ifeq "$(PROCTYPE)" "i386" ifeq "$(PROCTYPE)" "i386"
PACKAGE_LIB_DIR=macosx_x86.plt
UNOPKG_PLATFORM=MacOSX_x86 UNOPKG_PLATFORM=MacOSX_x86
JAVA_PROC_TYPE=x86 JAVA_PROC_TYPE=x86
else else
ifeq "$(PROCTYPE)" "x86_64" ifeq "$(PROCTYPE)" "x86_64"
PACKAGE_LIB_DIR=macosx_x86.plt
UNOPKG_PLATFORM=MacOSX_x86 UNOPKG_PLATFORM=MacOSX_x86
JAVA_PROC_TYPE=x86 JAVA_PROC_TYPE=x86
else else
PACKAGE_LIB_DIR=macosx_ppc.plt
UNOPKG_PLATFORM=MacOSX_PowerPC UNOPKG_PLATFORM=MacOSX_PowerPC
JAVA_PROC_TYPE=ppc JAVA_PROC_TYPE=ppc
endif endif
...@@ -500,19 +489,15 @@ PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1) ...@@ -500,19 +489,15 @@ PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM))) ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM)))
PLATFORM=kfreebsd PLATFORM=kfreebsd
ifeq "$(PROCTYPE)" "x86_64" ifeq "$(PROCTYPE)" "x86_64"
PACKAGE_LIB_DIR=kfreebsd_x86_64.plt
UNOPKG_PLATFORM=kFreeBSD_x86_64 UNOPKG_PLATFORM=kFreeBSD_x86_64
else else
PACKAGE_LIB_DIR=kfreebsd_x86.plt
UNOPKG_PLATFORM=kFreeBSD_x86 UNOPKG_PLATFORM=kFreeBSD_x86
endif endif
else else
PLATFORM=freebsd PLATFORM=freebsd
ifeq "$(PROCTYPE)" "x86_64" ifeq "$(PROCTYPE)" "x86_64"
PACKAGE_LIB_DIR=freebsd_x86_64.plt
UNOPKG_PLATFORM=FreeBSD_x86_64 UNOPKG_PLATFORM=FreeBSD_x86_64
else else
PACKAGE_LIB_DIR=freebsd_x86.plt
UNOPKG_PLATFORM=FreeBSD_x86 UNOPKG_PLATFORM=FreeBSD_x86
endif endif
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment