fix to recent modifications; more entries in gitignore

aptana · May 3, 2010 · 22418d7 · 22418d7
1 parent 1975201
commit 22418d7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+.DS_Store
+CVS/
+.cvsignore
 .svn/
 .deps/
 *.o
@@ -8,12 +11,16 @@
 *.so
 *.so.*
 *.slo
+*.pyc
 server/distro/*.zip
 server/distro/jam/Apache22-local/
 server/distro/jam/Apache22/
 server/AptanaJaxer/
 server/src/httpd-2.2.6/
 server/src/libevent/
 server/src/google/google_breakpad/
+server/local_settings.py
+server/src/mozilla/.mozconfig
+server/src/mozilla/.mozconfig.mk
 server/src/mozilla/ff-release/
 server/src/mozilla/ff-debug/
diff --git a/server/src/mozilla/netwerk/Makefile.in b/server/src/mozilla/netwerk/Makefile.in
@@ -57,6 +57,21 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 
+ifdef JAXER
+DIRS		= \
+		base \
+		cookie \
+		dns \
+		socket \
+		mime \
+		streamconv \
+		cache \
+		protocol \
+		system \
+		build \
+		locales \
+		$(NULL)
+else
 DIRS		= \
 		base \
 		cookie \
@@ -68,11 +83,10 @@ DIRS		= \
 		protocol \
 		system \
 		build \
-ifndef JAXER
 		resources \
-endif
 		locales \
 		$(NULL)
+endif
 
 ifdef ENABLE_TESTS
 TOOL_DIRS  += test