Minor changes to make merge with sync easier

src/Makefile

@@ -30,7 +30,7 @@ ifeq ($(.SHELLSTATUS),0)
 endif
 
 LIBRARY=libpEpJNI.a
-JAR=jniadapter.jar
+JAR=pEp.jar
 
 ifeq ($(BUILD_FOR),Linux)
     SHARED=libpEpJNI.so

src/Makefile.conf

@@ -29,9 +29,9 @@ else ifeq ($(BUILD_FOR),Darwin)
 endif
 
 ifeq ($(BUILD_FOR),Linux)
-    CXXFLAGS=-fdiagnostics-color=always -fpermissive -fPIC -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(AD_INC) $(ENGINE_INC)
+    CXXFLAGS=-fdiagnostics-color=always -fpermissive -fPIC -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(AD_INC) $(ENGINE_INC) -DDISABLE_SYNC
 else ifeq ($(BUILD_FOR),Darwin)
-    CXXFLAGS=-fcolor-diagnostics -fpermissive -fPIC -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin $(AD_INC) $(ENGINE_INC)
+    CXXFLAGS=-fcolor-diagnostics -fpermissive -fPIC -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin $(AD_INC) $(ENGINE_INC) -DDISABLE_SYNC
 endif