brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Move config.h under clutter/

Browse Source 
We should not have header files in the project root.
This commit is contained in:
Emmanuele Bassi 2012-07-28 17:40:57 +01:00
parent 0df23b7fd6
commit 9f83b64182
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -23,8 +23,6 @@ EXTRA_DIST = \
ChangeLog.pre-git-import \ ChangeLog.pre-git-import \
README.in \ README.in \
README \ README \
config.h.win32 \
config.h.win32.in \
$(NULL) $(NULL)
CLEANFILES = $(pcfiles) CLEANFILES = $(pcfiles)

8
build/win32/vs10/clutter.props
View File

@ -17,9 +17,9 @@
<TestProgDef>$(BaseBuildDef);TESTS_DATADIR="../share/clutter-$(ClutterApiVersion)/data"</TestProgDef> <TestProgDef>$(BaseBuildDef);TESTS_DATADIR="../share/clutter-$(ClutterApiVersion)/data"</TestProgDef>
<TestPerfProgDef>$(BaseBuildDef);TESTS_DATA_DIR="../share/clutter-$(ClutterApiVersion)/data";$(ClutterDisableDeprecationWarnings)</TestPerfProgDef> <TestPerfProgDef>$(BaseBuildDef);TESTS_DATA_DIR="../share/clutter-$(ClutterApiVersion)/data";$(ClutterDisableDeprecationWarnings)</TestPerfProgDef>
<PreBuildWin> <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 :DONE_CONFIG_H
@ -34,9 +34,9 @@ copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h
:DONE_CLUTTER_CONFIG_H :DONE_CLUTTER_CONFIG_H
</PreBuildWin> </PreBuildWin>
<PreBuildGDK> <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 :DONE_CONFIG_H

8
build/win32/vs9/clutter.vsprops
View File

@ -77,8 +77,8 @@
<UserMacro <UserMacro
Name="PreBuildWin" Name="PreBuildWin"
Value=" Value="
if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A; if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A; copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h&#x0D;&#x0A;
:DONE_CONFIG_H&#x0D;&#x0A; :DONE_CONFIG_H&#x0D;&#x0A;
if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H&#x0D;&#x0A; if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
del clutter.bld.*.win32&#x0D;&#x0A; del clutter.bld.*.win32&#x0D;&#x0A;
@ -90,8 +90,8 @@ copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h&#
<UserMacro <UserMacro
Name="PreBuildGDK" Name="PreBuildGDK"
Value=" Value="
if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A; if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A; copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h&#x0D;&#x0A;
:DONE_CONFIG_H&#x0D;&#x0A; :DONE_CONFIG_H&#x0D;&#x0A;
if exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H&#x0D;&#x0A; if exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
del clutter.bld.*.win32&#x0D;&#x0A; del clutter.bld.*.win32&#x0D;&#x0A;

6
clutter/Makefile.am
View File

@ -338,6 +338,12 @@ built_source_h = \
DISTCLEANFILES += clutter-config.h DISTCLEANFILES += clutter-config.h
EXTRA_DIST += clutter-config.h.in EXTRA_DIST += clutter-config.h.in
# win32 config header
EXTRA_DIST += \
config.h.win32.in \
config.h.win32 \
$(NULL)
# version header # version header
DISTCLEANFILES += clutter-version.h DISTCLEANFILES += clutter-version.h
EXTRA_DIST += clutter-version.h.in clutter-version.h EXTRA_DIST += clutter-version.h.in clutter-version.h

0
config.h.win32.in → clutter/config.h.win32.in
View File

4
configure.ac
View File

@ -54,7 +54,7 @@ AC_INIT([clutter],
[http://www.clutter-project.org]) [http://www.clutter-project.org])
AC_CONFIG_SRCDIR([clutter/clutter.h]) AC_CONFIG_SRCDIR([clutter/clutter.h])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([clutter/config.h])
AC_CONFIG_AUX_DIR([build]) AC_CONFIG_AUX_DIR([build])
AC_CONFIG_MACRO_DIR([build/autotools]) AC_CONFIG_MACRO_DIR([build/autotools])
@ -1151,7 +1151,6 @@ dnl ===========================================================================
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
config.h.win32
README README
build/Makefile build/Makefile
@ -1162,6 +1161,7 @@ AC_CONFIG_FILES([
build/win32/vs10/Makefile build/win32/vs10/Makefile
clutter/Makefile clutter/Makefile
clutter/config.h.win32
clutter/clutter-config.h clutter/clutter-config.h
clutter/clutter-version.h clutter/clutter-version.h
clutter/clutter-$CLUTTER_API_VERSION.pc:clutter/clutter.pc.in clutter/clutter-$CLUTTER_API_VERSION.pc:clutter/clutter.pc.in