Commit 9f83b641 authored by Emmanuele Bassi's avatar Emmanuele Bassi

build: Move config.h under clutter/

We should not have header files in the project root.
parent 0df23b7f
......@@ -23,8 +23,6 @@ EXTRA_DIST = \
ChangeLog.pre-git-import \
README.in \
README \
config.h.win32 \
config.h.win32.in \
$(NULL)
CLEANFILES = $(pcfiles)
......
......@@ -17,9 +17,9 @@
<TestProgDef>$(BaseBuildDef);TESTS_DATADIR="../share/clutter-$(ClutterApiVersion)/data"</TestProgDef>
<TestPerfProgDef>$(BaseBuildDef);TESTS_DATA_DIR="../share/clutter-$(ClutterApiVersion)/data";$(ClutterDisableDeprecationWarnings)</TestPerfProgDef>
<PreBuildWin>
if exist ..\..\..\config.h goto DONE_CONFIG_H
if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H
copy ..\..\..\config.h.win32 ..\..\..\config.h
copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h
:DONE_CONFIG_H
......@@ -34,9 +34,9 @@ copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h
:DONE_CLUTTER_CONFIG_H
</PreBuildWin>
<PreBuildGDK>
if exist ..\..\..\config.h goto DONE_CONFIG_H
if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H
copy ..\..\..\config.h.win32 ..\..\..\config.h
copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h
:DONE_CONFIG_H
......
......@@ -77,8 +77,8 @@
<UserMacro
Name="PreBuildWin"
Value="
if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h&#x0D;&#x0A;
:DONE_CONFIG_H&#x0D;&#x0A;
if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
del clutter.bld.*.win32&#x0D;&#x0A;
......@@ -90,8 +90,8 @@ copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h&#
<UserMacro
Name="PreBuildGDK"
Value="
if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h&#x0D;&#x0A;
:DONE_CONFIG_H&#x0D;&#x0A;
if exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
del clutter.bld.*.win32&#x0D;&#x0A;
......
......@@ -338,6 +338,12 @@ built_source_h = \
DISTCLEANFILES += clutter-config.h
EXTRA_DIST += clutter-config.h.in
# win32 config header
EXTRA_DIST += \
config.h.win32.in \
config.h.win32 \
$(NULL)
# version header
DISTCLEANFILES += clutter-version.h
EXTRA_DIST += clutter-version.h.in clutter-version.h
......
......@@ -54,7 +54,7 @@ AC_INIT([clutter],
[http://www.clutter-project.org])
AC_CONFIG_SRCDIR([clutter/clutter.h])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_HEADERS([clutter/config.h])
AC_CONFIG_AUX_DIR([build])
AC_CONFIG_MACRO_DIR([build/autotools])
......@@ -1151,7 +1151,6 @@ dnl ===========================================================================
AC_CONFIG_FILES([
Makefile
config.h.win32
README
build/Makefile
......@@ -1162,6 +1161,7 @@ AC_CONFIG_FILES([
build/win32/vs10/Makefile
clutter/Makefile
clutter/config.h.win32
clutter/clutter-config.h
clutter/clutter-version.h
clutter/clutter-$CLUTTER_API_VERSION.pc:clutter/clutter.pc.in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment