*** ../openssl-1.0.1j.orig/Makefile.org	2014-10-15 21:53:39.000000000 +0900
--- ./Makefile.org	2014-10-30 22:41:40.076565698 +0900
***************
*** 169,179 ****
  ONEDIRS=out tmp
  EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
  WDIRS=  windows
! LIBS=   libcrypto.a libssl.a
  SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
  SHARED_SSL=libssl$(SHLIB_EXT)
! SHARED_LIBS=
  SHARED_LIBS_LINK_EXTS=
  SHARED_LDFLAGS=
  
  GENERAL=        Makefile
--- 169,185 ----
  ONEDIRS=out tmp
  EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
  WDIRS=  windows
! LIBS_A_CRYPTO=libcrypto.a
! LIBS_A_SSL=libssl.a
  SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
  SHARED_SSL=libssl$(SHLIB_EXT)
! LIBS_CRYPTO=$(LIBS_A_CRYPTO) $(SHARED_CRYPTO)
! LIBS_SSL=$(LIBS_A_SSL) $(SHARED_SSL)
! SHARED_ENGINES=lib4758cca.so libaep.so libatalla.so libcapi.so libchil.so libcswift.so libgmp.so libgost.so libnuron.so libpadlock.so libsureware.so libubsec.so
! LIBS=$(LIBS_A_CRYPTO) $(LIBS_SSL)
  SHARED_LIBS_LINK_EXTS=
+ SHARED_LIBS=$(SHARED_CRYPTO) $(SHARED_SSL) $(SHARED_ENGINES)
+ OPENSSL_LIBS=$(LIBS) $(SHARED_LIBS)
  SHARED_LDFLAGS=
  
  GENERAL=        Makefile
***************
*** 268,291 ****
  	@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
  
  sub_all: build_all
! build_all: build_libs build_apps build_tests build_tools
  
! build_libs: build_crypto build_ssl build_engines
! 
! build_crypto:
  	@dir=crypto; target=all; $(BUILD_ONE_CMD)
! build_ssl:
  	@dir=ssl; target=all; $(BUILD_ONE_CMD)
! build_engines:
  	@dir=engines; target=all; $(BUILD_ONE_CMD)
! build_apps:
  	@dir=apps; target=all; $(BUILD_ONE_CMD)
! build_tests:
  	@dir=test; target=all; $(BUILD_ONE_CMD)
! build_tools:
  	@dir=tools; target=all; $(BUILD_ONE_CMD)
  
! all_testapps: build_libs build_testapps
  build_testapps:
  	@dir=crypto; target=testapps; $(BUILD_ONE_CMD)
  
--- 274,295 ----
  	@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
  
  sub_all: build_all
! build_all: build_apps build_tests build_tools
  
! $(LIBS_CRYPTO):
  	@dir=crypto; target=all; $(BUILD_ONE_CMD)
! $(LIBS_SSL):
  	@dir=ssl; target=all; $(BUILD_ONE_CMD)
! $(SHARED_ENGINES):
  	@dir=engines; target=all; $(BUILD_ONE_CMD)
! build_apps: $(OPENSSL_LIBS)
  	@dir=apps; target=all; $(BUILD_ONE_CMD)
! build_tests: $(OPENSSL_LIBS)
  	@dir=test; target=all; $(BUILD_ONE_CMD)
! build_tools: $(OPENSSL_LIBS)
  	@dir=tools; target=all; $(BUILD_ONE_CMD)
  
! all_testapps: $(OPENSSL_LIBS) build_testapps
  build_testapps:
  	@dir=crypto; target=testapps; $(BUILD_ONE_CMD)