eclipse-swt-makefile.patch

   1 --- make_linux.mak.orig 2005-06-27 20:53:36.000000000 +0200
   2 +++ make_linux.mak      2005-06-30 22:05:11.000000000 +0200
   3 @@ -50,7 +50,7 @@
   4  # Uncomment for Native Stats tool
   5  #NATIVE_STATS = -DNATIVE_STATS
   6
   7 -MOZILLACFLAGS = -O \
   8 +MOZILLACFLAGS = $(OPT) \
   9         -DXPCOM_GLUE=1 \
  10         -DMOZILLA_STRICT_API=1 \
  11         -fno-rtti \
  12 @@ -63,7 +63,13 @@
  13         -I$(JAVA_HOME)/include \
  14         -I$(JAVA_HOME)/include/linux \
  15         ${GECKO_INCLUDES} \
  16 -       ${SWT_PTR_CFLAGS}
  17 +       ${SWT_PTR_CFLAGS} \
  18 +       $(JAVA_INC) \
  19 +       -include /usr/include/mozilla/mozilla-config.h \
  20 +       -I/usr/include/nspr \
  21 +       -I/usr/include/mozilla/xpcom \
  22 +       -I/usr/include/mozilla/string \
  23 +       -I/usr/include/mozilla/embed_base
  24
  25  MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic ${GECKO_LIBS}
  26
  27 @@ -75,14 +81,15 @@
  28  GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
  29  MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
  30
  31 -CFLAGS = -O -Wall \
  32 +CFLAGS = $(OPT) -Wall \
  33                 -DSWT_VERSION=$(SWT_VERSION) \
  34                 $(NATIVE_STATS) \
  35                 -DLINUX -DGTK \
  36                 -I$(JAVA_HOME)/include \
  37                 -I$(JAVA_HOME)/include/linux \
  38                 -fpic \
  39 -               ${SWT_PTR_CFLAGS}
  40 +               ${SWT_PTR_CFLAGS} \
  41 +               $(JAVA_INC)
  42  LIBS = -shared -fpic -s
  43
  44
  45 @@ -94,16 +101,16 @@
  46  make_swt: $(SWT_LIB) $(SWTPI_LIB)
  47
  48  $(SWT_LIB): $(SWT_OBJECTS)
  49 -       $(LD) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS)
  50 -
  51 +       $(CC) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS)
  52 +
  53  callback.o: callback.c callback.h
  54         $(CC) $(CFLAGS) -c callback.c
  55
  56  $(SWTPI_LIB): $(SWTPI_OBJECTS)
  57 -       $(LD) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
  58 -
  59 +       $(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
  60 +
  61  swt.o: swt.c swt.h
  62 -       $(CC) $(CFLAGS) -c swt.c
  63 +       $(CC) $(CFLAGS) $(JAVA_INC) -c swt.c
  64  os.o: os.c os.h swt.h os_custom.h
  65         $(CC) $(CFLAGS) $(GTKCFLAGS) -c os.c
  66  os_structs.o: os_structs.c os_structs.h os.h swt.h
  67 @@ -136,7 +143,7 @@
  68  make_awt:$(AWT_LIB)
  69
  70  $(AWT_LIB): $(AWT_OBJECTS)
  71 -       $(LD) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
  72 +       $(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
  73
  74  #
  75  # Atk lib
  76 @@ -144,7 +151,7 @@
  77  make_atk: $(ATK_LIB)
  78
  79  $(ATK_LIB): $(ATK_OBJECTS)
  80 -       $(LD) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
  81 +       $(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
  82
  83  atk.o: atk.c atk.h
  84         $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
  85 @@ -161,7 +168,7 @@
  86  make_gnome: $(GNOME_LIB)
  87
  88  $(GNOME_LIB): $(GNOME_OBJECTS)
  89 -       $(LD) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
  90 +       $(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
  91
  92  gnome.o: gnome.c
  93         $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c