*** old/agent/src/os/bsd/Makefile	Wed Mar 13 23:31:44 2013
--- new/agent/src/os/bsd/Makefile	Wed Mar 13 23:31:43 2013

*** 1,7 ****
--- 1,7 ----
  #
! # Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
! # Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.

*** 20,77 ****
--- 20,102 ----
  # or visit www.oracle.com if you need additional information or have any
  # questions.
  #  
  #
  
! ARCH := $(shell if ([ `uname -m` = "ia64" ])  ; then echo ia64 ; elif ([ `uname -m` = "amd64" ]) ; then echo amd64; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
+ 
+ OS       := $(shell uname -s)
+ 
  GCC      = gcc
  
  JAVAH    = ${JAVA_HOME}/bin/javah
  
+ ifneq ($(OS), Darwin)
  SOURCES  = salibelf.c   \
          symtab.c        \
          libproc_impl.c  \
          ps_proc.c       \
          ps_core.c       \
          BsdDebuggerLocal.c
+ OBJS    = $(SOURCES:.c=.o)
+ OBJSPLUS = $(OBJS) sadis.o
+ LIBSA = $(ARCH)/libsaproc.so
  
  INCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/$(shell uname -s | tr "[:upper:]" "[:lower:]")
+ LIBS     = -lutil -lthread_db
  
+ else
+ 
+ SOURCES  = symtab.c     \
+         libproc_impl.c  \
+         ps_core.c
  OBJS    = $(SOURCES:.c=.o)
+ OBJSPLUS = MacosxDebuggerLocal.o sadis.o $(OBJS)
+ EXTINCLUDE = -I/System/Library/Frameworks/JavaVM.framework/Headers -I.
+ EXTCFLAGS = -m64 -D__APPLE__ -framework JavaNativeFoundation
+ FOUNDATIONFLAGS = -framework Foundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks -framework JavaNativeFoundation -framework Security -framework CoreFoundation
+ LIBSA = $(ARCH)/libsaproc.dylib
+ endif   # Darwin
  
  LIBS     = -lutil -lthread_db
+ INCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/$(shell uname -s | tr "[:upper:]" "[:lower:]") $(EXTINCLUDE)
  
  CFLAGS   = -c -fPIC -g -Wall -D_ALLBSD_SOURCE -D_GNU_SOURCE -D$(ARCH) $(INCLUDES)
  
  LIBSA = $(ARCH)/libsaproc.so
  
+ CFLAGS   = -c -fPIC -g -Wall -D_ALLBSD_SOURCE -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) $(EXTCFLAGS)
+ 
+ 
+ 
  all: $(LIBSA)
  
  BsdDebuggerLocal.o: BsdDebuggerLocal.c
          $(JAVAH) -jni -classpath ../../../../../build/bsd-i586/hotspot/outputdir/bsd_i486_compiler2/generated/saclasses  \
+ MacosxDebuggerLocal.o: MacosxDebuggerLocal.m
+         echo "OS="$(OS)
+         $(JAVAH) -jni -classpath ../../../build/classes  \
                  sun.jvm.hotspot.debugger.x86.X86ThreadContext \
                  sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
+         $(GCC) $(CFLAGS) $(FOUNDATIONFLAGS) $<
+ 
+ sadis.o: ../../share/native/sadis.c
+         $(JAVAH) -jni -classpath ../../../build/classes \
+                 sun.jvm.hotspot.asm.Disassembler
          $(GCC) $(CFLAGS) $<
  
  .c.obj:
          $(GCC) $(CFLAGS)
  
  ifndef LDNOMAP
    LFLAGS_LIBSA = -Xlinker --version-script=mapfile
  endif
  
! $(LIBSA): $(OBJSPLUS) mapfile 
          if [ ! -d $(ARCH) ] ; then mkdir $(ARCH) ; fi
!         $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS)
!         $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(FOUNDATIONFLAGS) $(OBJSPLUS) $(LIBS) $(SALIBS)
  
  test.o: $(LIBSA) test.c
          $(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c
  
  test: test.o
          $(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS)
  
  clean:
          rm -f $(LIBSA)
!         rm -f $(OBJS)
!         rm -f *.o
          rm -f test.o
          -rmdir $(ARCH)