[PATCH] move headers from solenv/inc/ to include/

[Matúš Kukan (via_Code_Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3403

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/3403/1

move headers from solenv/inc/ to include/

Change-Id: Ieb6cba645b3535f7d683d2aefa5599d04d9994f3
---
M configure.ac
R include/postmac.h
R include/postwin.h
R include/premac.h
R include/prewin.h
R include/shlinfo.rc
R include/version.hrc
R include/wntgcci/jni_md.h
R include/wntgcci/sehandler.hxx
9 files changed, 2 insertions(+), 3 deletions(-)



diff --git a/configure.ac b/configure.ac
index 64e574e7..b0f5d9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3769,7 +3769,6 @@
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/$OUTPATH"
     SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
@@ -3801,7 +3800,7 @@
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/win32 -I$SRC_ROOT/solenv/inc/$OUTPATH"
+    SOLARINC="$SOLARINC -I$SRC_ROOT/include/wntgcci"
     SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
@@ -3941,7 +3940,7 @@
     INSTDIR=${BUILDDIR}/instdir/${INPATH}
 fi
 OUTDIR="${SOLARVER}/${INPATH}"
-SOLARINC="-I. -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc -I${INSTDIR}/${SDKDIR}/include -I$SRC_ROOT/solenv/inc $SOLARINC"
+SOLARINC="-I. -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc -I${INSTDIR}/${SDKDIR}/include -I$SRC_ROOT/include $SOLARINC"
 AC_SUBST(COM)
 AC_SUBST(CPU)
 AC_SUBST(CPUNAME)
diff --git a/solenv/inc/postmac.h b/include/postmac.h
similarity index 100%
rename from solenv/inc/postmac.h
rename to include/postmac.h
diff --git a/solenv/inc/postwin.h b/include/postwin.h
similarity index 100%
rename from solenv/inc/postwin.h
rename to include/postwin.h
diff --git a/solenv/inc/premac.h b/include/premac.h
similarity index 100%
rename from solenv/inc/premac.h
rename to include/premac.h
diff --git a/solenv/inc/prewin.h b/include/prewin.h
similarity index 100%
rename from solenv/inc/prewin.h
rename to include/prewin.h
diff --git a/solenv/inc/shlinfo.rc b/include/shlinfo.rc
similarity index 100%
rename from solenv/inc/shlinfo.rc
rename to include/shlinfo.rc
diff --git a/solenv/inc/version.hrc b/include/version.hrc
similarity index 100%
rename from solenv/inc/version.hrc
rename to include/version.hrc
diff --git a/solenv/inc/win32/jni_md.h b/include/wntgcci/jni_md.h
similarity index 100%
rename from solenv/inc/win32/jni_md.h
rename to include/wntgcci/jni_md.h
diff --git a/solenv/inc/wntgcci/sehandler.hxx b/include/wntgcci/sehandler.hxx
similarity index 100%
rename from solenv/inc/wntgcci/sehandler.hxx
rename to include/wntgcci/sehandler.hxx

-- 
To view, visit https://gerrit.libreoffice.org/3403
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb6cba645b3535f7d683d2aefa5599d04d9994f3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan <matus.kukan at gmail.com>