diff --git a/.gitignore b/.gitignore
index 3a8eb59..ce354e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,14 @@ quake2
 release*
 tags
 *.libs
+Makefile
+Makefile.in
+config.h
+config.log
+configure
+config.status
+install-sh
+missing
+mkinstalldirs
+stamp-h
+stamp-h.in
diff --git a/client/.gitignore b/client/.gitignore
deleted file mode 100644
index 2cc377c..0000000
--- a/client/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.d
-.vimrc
diff --git a/configure.in b/configure.in
index fea52be..447e790 100644
--- a/configure.in
+++ b/configure.in
@@ -58,8 +58,8 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([bzero floor getcwd gethostbyname getmntent getpagesize gettimeofday memmove memset mkdir munmap pow putenv select socket sqrt strcasecmp strchr strdup strerror strrchr strstr])
 
 AC_CONFIG_FILES([Makefile
-				 src/Makefile])
-				 #game/Makefile])
+				 src/Makefile
+				 game/Makefile])
 #				 ref_gl/Makefile
 #				 ref_soft/Makefile])
 AC_OUTPUT
diff --git a/game/Makefile.am b/game/Makefile.am
index c0af4d3..da9fb96 100644
--- a/game/Makefile.am
+++ b/game/Makefile.am
@@ -2,7 +2,7 @@
 
 # Process this file with automake to create Makefile.in
 
-lib_LIBRARIES = game.so
+bin_PROGRAMS = game.so
 game_so_SOURCES = g_ai.c \
 			p_client.c \
 			g_chase.c \
diff --git a/qcommon/.gitignore b/qcommon/.gitignore
deleted file mode 100644
index 2cc377c..0000000
--- a/qcommon/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.d
-.vimrc
diff --git a/server/.gitignore b/server/.gitignore
deleted file mode 100644
index 2cc377c..0000000
--- a/server/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.d
-.vimrc
diff --git a/src/Makefile b/src/Makefile
index fff87b6..de585f2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -65,13 +65,15 @@ CC = gcc
 MAINT = #
 MAKEINFO = makeinfo
 PACKAGE = quake2
+RANLIB = ranlib
 VERSION = 0.1
 
 bin_PROGRAMS = quake2
 quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c 								cl_cin.c cl_ents.c cl_fx.c cl_input.c cl_inv.c 				cl_main.c cl_parse.c cl_pred.c cl_tent.c cl_scrn.c cl_view.c 				cl_newfx.c console.c keys.c menu.c qmenu.c 								snd_dma.c snd_mix.c snd_mem.c 								checksum.c cmd.c cmodel.c common.c crc.c cvar.c files.c 				mdfour.c net_chan.c 								sv_ccmds.c sv_ents.c sv_game.c sv_init.c sv_main.c 				sv_send.c sv_user.c sv_world.c 								cd.c snd.c 								q_shared.c pmove.c 								m_flash.c 								#snd_mixa.S
 
 
-CPPFLAGS = -Dstricmp=strcasecmp -Wall -Werror -pipe -DLINUX_VERSION=\"$(VERSION)\"
+AM_CFLAGS = -Wall -Werror -pipe
+AM_CPPFLAGS = -DLINUX_VERSION="\"$(VERSION)\"" -Dstricmp=strcasecmp
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -79,6 +81,7 @@ PROGRAMS =  $(bin_PROGRAMS)
 
 
 DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
+CPPFLAGS = 
 LDFLAGS = 
 LIBS = -lpthread -lm -ldl -lGL 
 quake2_OBJECTS =  main.o q_sh.o vid_menu.o vid_so.o glob.o net_udp.o \
@@ -120,7 +123,7 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
 $(srcdir)/Makefile.in: # Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -210,7 +213,7 @@ distdir: $(DISTFILES)
 	top_distdir=`cd $(top_distdir) && pwd`; \
 	distdir=`cd $(distdir) && pwd`; \
 	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/src/Makefile.am b/src/Makefile.am
index 32edd09..4540001 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,3 +26,4 @@ quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c \
 				#snd_mixa.S
 				
 AM_CFLAGS = -Wall -Werror -pipe
+AM_CPPFLAGS = -DLINUX_VERSION="\"$(VERSION)\"" -Dstricmp=strcasecmp