agent/src/os/solaris/proc/Makefile

*** 34,84 ****
  C++    := CC
  RM     := /usr/bin/rm
  MKDIRS := /usr/bin/mkdir -p
  
  CLASSES_DIR = ../../../../build/classes
  
  ifeq "$(ARCH_ORIG)" "i386"
   ALL_TARGET = i386 $(filter amd64,$(shell isalist))
  else
   ALL_TARGET = sparc sparcv9
  endif
  
  all:: $(ALL_TARGET)
  
  javahomecheck::
          @if [ "x$(JAVA_HOME)" = "x" ] ; then \
            echo You must set the environment variable JAVA_HOME before executing this Makefile ; \
            exit 1 ; \
          fi
  
! i386:: javahomecheck
          $(MKDIRS) $@
!         @javah -classpath $(CLASSES_DIR) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal
!         CC -G -KPIC -I${JAVA_HOME}/include -I${JAVA_HOME}/include/solaris saproc.cpp \
!            -M mapfile -o $@/libsaproc.so -ldemangle
!         CC -o $@/libsaproc_audit.so -G -Kpic -z defs saproc_audit.cpp -lmapmalloc -ldl -lc 
  
- amd64:: javahomecheck
-         $(MKDIRS) $@
-         @javah -classpath $(CLASSES_DIR) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal
-         CC -G -KPIC -xarch=amd64 -I${JAVA_HOME}/include -I${JAVA_HOME}/include/solaris saproc.cpp \
-            -M mapfile -o $@/libsaproc.so -ldemangle
-         CC -xarch=amd64 -o $@/libsaproc_audit.so -G -Kpic -z defs saproc_audit.cpp -lmapmalloc -ldl -lc 
- 
- sparc:: javahomecheck
-         $(MKDIRS) $@
-         @javah -classpath $(CLASSES_DIR) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal
-         CC -G -KPIC -xarch=v8  -I${JAVA_HOME}/include -I${JAVA_HOME}/include/solaris saproc.cpp \
-            -M mapfile -o $@/libsaproc.so -ldemangle
-         CC -xarch=v8 -o $@/libsaproc_audit.so -G -Kpic -z defs saproc_audit.cpp -lmapmalloc -ldl -lc 
- 
- sparcv9:: javahomecheck
-         $(MKDIRS) $@
-         @javah -classpath $(CLASSES_DIR) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal
-         CC -G -KPIC -xarch=v9 -I${JAVA_HOME}/include -I${JAVA_HOME}/include/solaris saproc.cpp \
-            -M mapfile -o $@/libsaproc.so -ldemangle
-         CC -xarch=v9 -o $@/libsaproc_audit.so -G -Kpic -z defs saproc_audit.cpp -lmapmalloc -ldl -lc 
- 
  clean::
!         $(RM) -rf sun_jvm_hotspot_debugger_proc_ProcDebuggerLocal.h
!         $(RM) -rf sparc sparcv9 i386
--- 34,70 ----
  C++    := CC
  RM     := /usr/bin/rm
  MKDIRS := /usr/bin/mkdir -p
  
  CLASSES_DIR = ../../../../build/classes
+ SAPROC_INCLUDES=-I${JAVA_HOME}/include -I${JAVA_HOME}/include/solaris
+ SADIS=../../../share/native/sadis.c
  
  ifeq "$(ARCH_ORIG)" "i386"
   ALL_TARGET = i386 $(filter amd64,$(shell isalist))
  else
   ALL_TARGET = sparc sparcv9
  endif
  
+ CFLAGS/i386   =
+ CFLAGS/amd64  = -xarch=amd64
+ CFLAGS/sparc  = -xarch=v8
+ CFLAGS/sparv9 = -xarch=v9
+ 
  all:: $(ALL_TARGET)
  
  javahomecheck::
          @if [ "x$(JAVA_HOME)" = "x" ] ; then \
            echo You must set the environment variable JAVA_HOME before executing this Makefile ; \
            exit 1 ; \
          fi
  
! i386 amd64 sparc sparcv9:: javahomecheck
          $(MKDIRS) $@
!         @javah -classpath $(CLASSES_DIR) -d $@ -jni sun.jvm.hotspot.asm.Disassembler sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal
!         CC $(CFLAGS/$@) -c -g -Kpic ${SAPROC_INCLUDES} -I$@ saproc.cpp -o $@/saproc.o
!         cc $(CFLAGS/$@) -c -g -Kpic ${SAPROC_INCLUDES} -I$@ $(SADIS) -o $@/sadis.o
!         CC $(CFLAGS/$@) -g -G -Kpic $@/saproc.o $@/sadis.o -M mapfile -o $@/libsaproc.so -ldemangle
!         CC $(CFLAGS/$@) -o $@/libsaproc_audit.so -G -Kpic -z defs saproc_audit.cpp -lmapmalloc -ldl -lc 
  
  clean::
!         $(RM) -rf sparc sparcv9 i386 amd64