Improve the generated build settings.

fusesource · Sep 9, 2013 · 1d27b2f · 1d27b2f
1 parent d9cd0ab
commit 1d27b2f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/maven-hawtjni-plugin/src/main/resources/project-template/configure.ac b/maven-hawtjni-plugin/src/main/resources/project-template/configure.ac
@@ -32,9 +32,9 @@ AC_CANONICAL_SYSTEM
 ## -----------------------------------------------
 @AC_PROG_CHECKS@
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL([disable-static])
 # Make AM_PROG_AR work before automake 1.12
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+AC_PROG_LIBTOOL([disable-static])
 
 ## -----------------------------------------------
 ## API Checks
@@ -55,7 +55,7 @@ AC_SUBST(LDFLAGS)
 ## -----------------------------------------------------
 ## Generate the files
 ## -----------------------------------------------------
-AM_INIT_AUTOMAKE([no-dependencies -Wall -Werror foreign])
+AM_INIT_AUTOMAKE([subdir-objects no-dependencies -Wall -Werror foreign])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 

diff --git a/maven-hawtjni-plugin/src/main/resources/project-template/vs2008.vcproj b/maven-hawtjni-plugin/src/main/resources/project-template/vs2008.vcproj
@@ -29,7 +29,7 @@
             PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" 
             ExceptionHandling="0" RuntimeLibrary="2" EnableFunctionLevelLinking="true" RuntimeTypeInfo="false" 
             UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" 
-            CallingConvention="2" CompileAs="1"/>
+            CallingConvention="2"/>
       <Tool Name="VCManagedResourceCompilerTool"/>
       <Tool Name="VCResourceCompilerTool"/>
       <Tool Name="VCPreLinkEventTool"/>
@@ -65,7 +65,7 @@
             PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS" 
             ExceptionHandling="0" RuntimeLibrary="2" EnableFunctionLevelLinking="true" RuntimeTypeInfo="false" 
             UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" 
-            CallingConvention="2" CompileAs="1"/>
+            CallingConvention="2"/>
       <Tool Name="VCManagedResourceCompilerTool"/>
       <Tool Name="VCResourceCompilerTool"/>
       <Tool Name="VCPreLinkEventTool"/>
@@ -101,7 +101,7 @@
             MinimalRebuild="true" 
             ExceptionHandling="0" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="false" 
             UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="4" 
-            CallingConvention="2" CompileAs="1"/>
+            CallingConvention="2"/>
       <Tool Name="VCManagedResourceCompilerTool"/>
       <Tool Name="VCResourceCompilerTool"/>
       <Tool Name="VCPreLinkEventTool"/>
@@ -136,7 +136,7 @@
             MinimalRebuild="true" 
             ExceptionHandling="0" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="false" 
             UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="4" 
-            CallingConvention="2" CompileAs="1"/>
+            CallingConvention="2"/>
       <Tool Name="VCManagedResourceCompilerTool"/>
       <Tool Name="VCResourceCompilerTool"/>
       <Tool Name="VCPreLinkEventTool"/>

diff --git a/maven-hawtjni-plugin/src/main/resources/project-template/vs2010.vcxproj b/maven-hawtjni-plugin/src/main/resources/project-template/vs2010.vcxproj
@@ -90,7 +90,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>StdCall</CallingConvention>
-      <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -117,7 +116,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>StdCall</CallingConvention>
-      <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -144,7 +142,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CallingConvention>StdCall</CallingConvention>
-      <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -169,7 +166,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CallingConvention>StdCall</CallingConvention>
-      <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>