--- Makefile.orig	Sun Feb 21 15:36:06 1999
+++ Makefile	Sun Apr 18 17:00:54 1999
@@ -5,7 +5,7 @@
 # USE_XMHTML=1
 #
 # Uncomment USE_THEMES for gtk-themes _OR_ USE_APPLET to build as a gnome-applet
-# USE_THEMES=1
+USE_THEMES=1
 # USE_APPLET=1
 #
 # Uncomment USE_GHTTP for GHTTP stuff.  Its not finished yet, but a very, 
@@ -18,34 +18,26 @@
 ifdef DEBUG
  CFLAGS+=-d -g
 endif
-CFLAGS+=-Wall -g
+CFLAGS+=-Wall
 ifdef USE_GHTTP
  CFLAGS+=-DUSE_GHTTP
  LIBS+=-lghttp
 endif
-ifdef USE_APPLET
- CFLAGS+=`gnome-config --cflags gnome gnomeui gtk gnorba` -DUSE_APPLET
- LIBS+=`gnome-config --libs gnome gnomeui gtk gnorba` -lpanel_applet
-else
- ifdef USE_THEMES
-  CFLAGS+=`gnome-config --cflags gnome gnomeui gtk` -DUSE_THEMES
-  LIBS+=`gnome-config --libs gnome gnomeui gtk`
- else
-  CFLAGS+=`gtk-config --cflags`
-  LIBS+=`gtk-config --libs`
- endif
+ifdef USE_THEMES
+ CFLAGS+=`gtk12-config --cflags`
+ LIBS+=`gtk12-config --libs`
 endif
 ifdef USE_XMHTML
  CFLAGS+=-DUSE_XMHTML
  LIBS+=-lgtkxmhtml -ljpeg -lXpm -lpng -lz
 endif
-CC=gcc
+CC?=gcc
 AU2H=./au2h
 SOUNDS=BuddyArrive.h BuddyLeave.h Receive.h Send.h
 OBJS=aim.o buddy.o toc.o im.o conversation.o buddy_chat.o html.o prefs.o sound.o about.o
 
-aim: $(OBJS)
-	$(CC) -o aim $(CFLAGS) $(OBJS) $(LIBS)
+gaim: $(OBJS)
+	$(CC) -o gaim $(CFLAGS) $(OBJS) $(LIBS)
 
 BuddyArrive.h: au2h BuddyArrive.au
 	$(AU2H) BuddyArrive.au BuddyArrive.h