2003/07/05 22:11:55

darcs-hash:20040130070250-2ba56-7c704ef895f96bef7082ef385f48001928d6e751.gz

diff --git a/Makefile b/Makefile
index a4b6c46..57a956c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -191,6 +191,7 @@ upstream/Carbon/include/Carbon: upstream
        # A disgusting hack to create symlinks to the OS X Framework headers, since the
        # standard GCC doesn't know how to search Frameworks for header files.
        outdir="upstream/Carbon/include"; \
        # A disgusting hack to create symlinks to the OS X Framework headers, since the
        # standard GCC doesn't know how to search Frameworks for header files.
        outdir="upstream/Carbon/include"; \

+       mkdir -p $$outdir; \

        librarydir="/System/Library"; \
        frameworksubdir="Frameworks"; \
        cd $$outdir; \
        librarydir="/System/Library"; \
        frameworksubdir="Frameworks"; \
        cd $$outdir; \

@@ -241,6 +242,7 @@ Darwin: upstream
 
 Carbon: upstream/Carbon/include/Carbon upstream
        echo -e "\\n=== Carbon ========================================="
 
 Carbon: upstream/Carbon/include/Carbon upstream
        echo -e "\\n=== Carbon ========================================="

+       cd gcc/install/bin; ln -sf gcjh powerpc-apple-darwin-gcjh

        make gcj \
                platform=Carbon \
                target=powerpc-apple-darwin \
        make gcj \
                platform=Carbon \
                target=powerpc-apple-darwin \

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index 9daf8de..6613c16 100644 (file)
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -1,7 +1,6 @@
 // Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
 // Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 

-import java.applet.*;

 import java.net.*;
 import java.util.*;
 import java.io.*;
 import java.net.*;
 import java.util.*;
 import java.io.*;

diff --git a/src/org/xwt/Resources.java b/src/org/xwt/Resources.java
index e1e267f..615ef97 100644 (file)
--- a/src/org/xwt/Resources.java
+++ b/src/org/xwt/Resources.java
@@ -6,7 +6,6 @@ import java.net.*;
 import java.util.*;
 import java.util.zip.*;
 import java.lang.*;
 import java.util.*;
 import java.util.zip.*;
 import java.lang.*;

-import java.applet.*;

 import org.xwt.js.*;
 import org.xwt.util.*;
 
 import org.xwt.js.*;
 import org.xwt.util.*;
 

diff --git a/src/org/xwt/plat/Carbon.java b/src/org/xwt/plat/Carbon.java
index 77d4dd9..5dc019f 100644 (file)
--- a/src/org/xwt/plat/Carbon.java
+++ b/src/org/xwt/plat/Carbon.java
@@ -1,14 +1,11 @@
 // Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL]
 package org.xwt.plat;
 
 // Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL]
 package org.xwt.plat;
 

-import java.awt.*;
-import java.awt.image.*;

 import gnu.gcj.RawData;
 import java.net.*;
 import java.lang.reflect.*;
 import java.io.*;
 import java.util.*;
 import gnu.gcj.RawData;
 import java.net.*;
 import java.lang.reflect.*;
 import java.io.*;
 import java.util.*;

-import java.awt.peer.*;

 import org.xwt.util.*;
 import org.xwt.*;
 
 import org.xwt.util.*;
 import org.xwt.*;
 

diff --git a/src/org/xwt/plat/POSIX.java b/src/org/xwt/plat/POSIX.java
index 0855306..fd1ebef 100644 (file)
--- a/src/org/xwt/plat/POSIX.java
+++ b/src/org/xwt/plat/POSIX.java
@@ -1,14 +1,11 @@
 // Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL]
 package org.xwt.plat;
 
 // Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL]
 package org.xwt.plat;
 

-import java.awt.*;
-import java.awt.image.*;

 import gnu.gcj.RawData;
 import java.net.*;
 import java.lang.reflect.*;
 import java.io.*;
 import java.util.*;
 import gnu.gcj.RawData;
 import java.net.*;
 import java.lang.reflect.*;
 import java.io.*;
 import java.util.*;

-import java.awt.peer.*;

 import org.xwt.util.*;
 import org.xwt.*;
 
 import org.xwt.util.*;
 import org.xwt.*;