js-makefile.patch

   1 --- js/src/Makefile.ref.orig    Tue Mar 19 05:28:16 2002
   2 +++ js/src/Makefile.ref Sat May 18 15:36:52 2002
   3 @@ -56,7 +56,7 @@
   4
   5  ifdef JS_THREADSAFE
   6  DEFINES += -DJS_THREADSAFE
   7 -INCLUDES += -I../../dist/$(OBJDIR)/include
   8 +INCLUDES += -I../../dist/$(OBJDIR)/include -I/usr/include/nspr
   9  ifdef USE_MSVC
  10  OTHER_LIBS += ../../dist/$(OBJDIR)/lib/libnspr${NSPR_LIBSUFFIX}.lib
  11  else
  12 @@ -122,7 +122,7 @@
  13  ifdef JS_READLINE
  14  # For those platforms with the readline library installed.
  15  DEFINES += -DEDITLINE
  16 -PROG_LIBS += -lreadline -ltermcap
  17 +PROG_LIBS += -lreadline
  18  else
  19  ifdef JS_EDITLINE
  20  # Use the editline library, built locally.
  21 @@ -281,6 +281,7 @@
  22  PROGRAM = $(OBJDIR)/js
  23  ifdef JS_PERLCONNECT
  24  PROG_LIBS += $(PERLLDFLAGS)
  25 +OTHER_LIBS += $(PERLLDFLAGS)
  26  endif
  27  endif
  28
  29 @@ -291,7 +291,7 @@
  30         link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
  31  else
  32  $(PROGRAM): $(PROG_OBJS) $(LIBRARY) $(FDLIBM_LIBRARY)
  33 -       $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
  34 +       $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) -L$(OBJDIR) -ljs $(LDFLAGS) $(OTHER_LIBS) \
  35             $(PROG_LIBS)
  36  endif
  37
  38 --- js/src/perlconnect/Makefile.PL.orig Tue Aug 14 15:09:43 2001
  39 +++ js/src/perlconnect/Makefile.PL      Sat May 18 16:32:49 2002
  40 @@ -40,7 +40,7 @@
  41         open FOO, ">tempmakefile";
  42         print FOO $tmpmk;
  43         close FOO;
  44 -       my $objdir = `gmake -f tempmakefile`;
  45 +       my $objdir = `make -f tempmakefile`;
  46         unlink "tempmakefile";
  47         $inc = "-I.. -I../$objdir";
  48         $libpath = "-L../$objdir";
  49 --- js/src/liveconnect/Makefile.ref.orig        Tue Mar 19 05:28:45 2002
  50 +++ js/src/liveconnect/Makefile.ref     Sat May 18 18:40:34 2002
  51 @@ -125,7 +125,7 @@
  52
  53  ifdef JS_THREADSAFE
  54  DEFINES += -DJS_THREADSAFE
  55 -INCLUDES += -I../../../dist/$(OBJDIR)/include
  56 +INCLUDES += -I../../../dist/$(OBJDIR)/include -I/usr/include/nspr
  57  ifdef USE_MSVC
  58  OTHER_LIBS += $(DEPTH)/../../dist/$(OBJDIR)/lib/libnspr${NSPR_LIBSUFFIX}.lib
  59  else
  60 @@ -159,5 +159,5 @@
  61
  62  $(PROGRAM): $(OBJDIR)/$(PROG_FILE).o $(OBJDIR)/jsj_simpleapi.o
  63         @$(MAKE_OBJDIR)
  64 -       $(CC) -o $@ $(CFLAGS) $+ $(LIBRARY) ../$(OBJDIR)/libjs.a $(LDFLAGS) $(OTHER_LIBS)
  65 +       $(CC) -o $@ $(CFLAGS) $+ -L$(OBJDIR) -ljsj $(LDFLAGS) $(OTHER_LIBS) $(PROG_LIBS) -Wl,-rpath=$(JDK)/jre/lib/i386 -Wl,-rpath=$(JDK)/jre/lib/i386/native_threads -Wl,-rpath=$(JDK)/jre/lib/i386/classic -Wl,-rpath=$(JDK)/jre/lib/i386/client
  66  endif
  67 --- js/src/liveconnect/config/Linux_All.mk.orig Tue Mar 19 05:28:53 2002
  68 +++ js/src/liveconnect/config/Linux_All.mk      Sat May 18 18:51:49 2002
  69 @@ -45,9 +45,10 @@
  70  # INCLUDES   += -I$(JDK)/include -I$(JDK)/include/solaris
  71  INCLUDES   += -I$(JDK)/include/linux -I$(JDK)/include
  72
  73 -OTHER_LIBS += -L$(JDK)/jre/lib/i386/native_threads
  74 -OTHER_LIBS += -L$(JDK)/jre/lib/i386/classic
  75 -OTHER_LIBS += -L$(JDK)/jre/lib/i386 -ljava -ljvm -lhpi
  76 +PROG_LIBS += -L$(JDK)/jre/lib/i386/native_threads
  77 +PROG_LIBS += -L$(JDK)/jre/lib/i386/classic
  78 +PROG_LIBS += -L$(JDK)/jre/lib/i386/client
  79 +PROG_LIBS += -L$(JDK)/jre/lib/i386 -ljava -ljvm -lhpi -lverify
  80
  81  # To run lcshell with the above, built in a Mozilla tree with a local nspr:
  82  # LD_LIBRARY_PATH=../../../dist/lib:/share/builds/components/jdk/1.2.2/Linux/jre/lib/i386:/share/builds/components/jdk/1.2.2/Linux/jre/lib/i386/classic:/share/builds/components/jdk/1.2.2/Linux/jre/lib/i386/native_threads CLASSPATH=./classes/Linux_All_DBG.OBJ/js15lc30.jar lcshell
  83 --- js/src/rules.mk.orig        2003-11-15 01:11:04.000000000 +0100
  84 +++ js/src/rules.mk     2004-03-24 16:33:03.000000000 +0100
  85 @@ -73,6 +73,9 @@
  86         @$(MAKE_OBJDIR)
  87         $(CC) -o $@ -c $(CFLAGS) $*.c
  88
  89 +$(LIB_OBJS): $(OBJDIR)/%.o: %.c
  90 +       @$(MAKE_OBJDIR)
  91 +       $(CC) -o $@ -fPIC -c $(CFLAGS) $*.c
  92
  93  $(OBJDIR)/%.o: %.c
  94         @$(MAKE_OBJDIR)