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) $(LDFLAGS) $(PROG_OBJS) -L$(OBJDIR) -ljs $(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 @@ -29,7 +29,7 @@
  41  include ../config.mk
  42
  43  all:
  44 -       @echo '$(OBJDIR)'
  45 +       @echo '$(OBJDIR)' >&2
  46  eof
  47
  48  if ($foo{'m'}) {
  49 @@ -40,7 +40,7 @@
  50         open FOO, ">tempmakefile";
  51         print FOO $tmpmk;
  52         close FOO;
  53 -       my $objdir = `gmake -f tempmakefile`;
  54 +       my $objdir = `make -f tempmakefile 2>&1 >/dev/null`;
  55         unlink "tempmakefile";
  56         $inc = "-I.. -I../$objdir";
  57         $libpath = "-L../$objdir";
  58 --- js/src/liveconnect/Makefile.ref.orig        Tue Mar 19 05:28:45 2002
  59 +++ js/src/liveconnect/Makefile.ref     Sat May 18 18:40:34 2002
  60 @@ -125,7 +125,7 @@
  61
  62  ifdef JS_THREADSAFE
  63  DEFINES += -DJS_THREADSAFE
  64 -INCLUDES += -I../../../dist/$(OBJDIR)/include
  65 +INCLUDES += -I../../../dist/$(OBJDIR)/include -I/usr/include/nspr
  66  ifdef USE_MSVC
  67  OTHER_LIBS += $(DEPTH)/../../dist/$(OBJDIR)/lib/libnspr${NSPR_LIBSUFFIX}.lib
  68  else
  69 @@ -159,5 +159,5 @@
  70
  71  $(PROGRAM): $(OBJDIR)/$(PROG_FILE).o $(OBJDIR)/jsj_simpleapi.o
  72         @$(MAKE_OBJDIR)
  73 -       $(CC) -o $@ $(CFLAGS) $+ $(LIBRARY) ../$(OBJDIR)/libjs.a $(LDFLAGS) $(OTHER_LIBS)
  74 +       $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $+ -L$(OBJDIR) -ljsj $(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
  75  endif
  76 --- js/src/liveconnect/config/Linux_All.mk.orig Tue Mar 19 05:28:53 2002
  77 +++ js/src/liveconnect/config/Linux_All.mk      Sat May 18 18:51:49 2002
  78 @@ -45,9 +45,10 @@
  79  # INCLUDES   += -I$(JDK)/include -I$(JDK)/include/solaris
  80  INCLUDES   += -I$(JDK)/include/linux -I$(JDK)/include
  81
  82 -OTHER_LIBS += -L$(JDK)/jre/lib/i386/native_threads
  83 -OTHER_LIBS += -L$(JDK)/jre/lib/i386/classic
  84 -OTHER_LIBS += -L$(JDK)/jre/lib/i386 -ljava -ljvm -lhpi
  85 +PROG_LIBS += -L$(JDK)/jre/lib/i386/native_threads
  86 +PROG_LIBS += -L$(JDK)/jre/lib/i386/classic
  87 +PROG_LIBS += -L$(JDK)/jre/lib/i386/client
  88 +PROG_LIBS += -L$(JDK)/jre/lib/i386 -ljava -ljvm -lhpi -lverify
  89
  90  # To run lcshell with the above, built in a Mozilla tree with a local nspr:
  91  # 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
  92 --- js/src/rules.mk.orig        2003-11-15 01:11:04.000000000 +0100
  93 +++ js/src/rules.mk     2004-03-24 16:33:03.000000000 +0100
  94 @@ -73,6 +73,9 @@
  95         @$(MAKE_OBJDIR)
  96         $(CC) -o $@ -c $(CFLAGS) $*.c
  97
  98 +$(LIB_OBJS): $(OBJDIR)/%.o: %.c
  99 +       @$(MAKE_OBJDIR)
 100 +       $(CC) -o $@ -fPIC -c $(CFLAGS) $*.c
 101
 102  $(OBJDIR)/%.o: %.c
 103         @$(MAKE_OBJDIR)
 104 @@ -118,7 +118,7 @@
 105         $(RANLIB) $@
 106
 107  $(SHARED_LIBRARY): $(LIB_OBJS)
 108 -       $(MKSHLIB) -o $@ $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)
 109 +       $(MKSHLIB) $(LDFLAGS) -o $@ $(LIB_OBJS) $(OTHER_LIBS)
 110  endif
 111  endif
 112