[glib] Avoid much of duplication in lists of source files
- From: Tor Lillqvist <tml src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Avoid much of duplication in lists of source files
- Date: Sun, 21 Mar 2010 14:19:06 +0000 (UTC)
commit 226cc663e40606e9749a368e9d2b2e61d9a9d532
Author: Tor Lillqvist <tml iki fi>
Date: Sun Mar 21 16:11:49 2010 +0200
Avoid much of duplication in lists of source files
Don't keep the lists of source files for libglib, libgobject and
libgio in the VS project files in addition to the canonical location,
the corresponding Makefile.am files.
Instead, generate the corresponding .vcproj files at make dist time
using the C preprocessor, from template files called .vcprojin. We
still list explicitly in the .vcprojin files some of the
Windows-specific source files, and the sources files of gnulib and
pcre.
build/win32/vs9/Makefile.am | 3 +
build/win32/vs9/README.txt | 3 +-
build/win32/vs9/gio.vcproj | 608 --------------------
build/win32/vs9/{gobject.vcproj => gio.vcprojin} | 143 ++---
build/win32/vs9/{glib.vcproj => glib.vcprojin} | 330 +----------
.../win32/vs9/{gobject.vcproj => gobject.vcprojin} | 65 +--
gio/Makefile.am | 11 +-
glib/Makefile.am | 11 +-
gobject/Makefile.am | 11 +-
9 files changed, 113 insertions(+), 1072 deletions(-)
---
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 88d919a..e9b379f 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -3,12 +3,15 @@ EXTRA_DIST = \
glib.sln \
glib.vsprops \
glib.vcproj \
+ glib.vcprojin \
glib-genmarshal.vcproj \
gspawn-win32-helper-console.vcproj \
gspawn-win32-helper.vcproj \
gmodule.vcproj \
gobject.vcproj \
+ gobject.vcprojin \
gthread.vcproj \
gio.vcproj \
+ gio.vcprojin \
testglib.vcproj \
install.vcproj
diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt
index 662cb2a..43f1334 100644
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -4,7 +4,8 @@ This VS9 solution and the projects it includes are intented to be used
in a GLib source tree unpacked from a tarball. In a git checkout you
first need to use some Unix-like environment or manual work to expand
the .in files needed, mainly config.h.win32.in into config.h.win32 and
-glibconfig.h.win32.in into glibconfig.h.win32.
+glibconfig.h.win32.in into glibconfig.h.win32. You will also need to
+expand the .vcprojin files here into .vcproj files.
The only external dependency is proxy-libintl. Fetch the latest
proxy-libintl-dev zipfile from
diff --git a/build/win32/vs9/gobject.vcproj b/build/win32/vs9/gio.vcprojin
similarity index 60%
copy from build/win32/vs9/gobject.vcproj
copy to build/win32/vs9/gio.vcprojin
index a7d98c7..1772c46 100644
--- a/build/win32/vs9/gobject.vcproj
+++ b/build/win32/vs9/gio.vcprojin
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="gobject"
- ProjectGUID="{F172EFFC-E30F-4593-809E-DB2024B1E753}"
- RootNamespace="gobject"
- Keyword="Win32Proj"
+ Name="gio"
+ ProjectGUID="{F3D1583C-5613-4809-BD98-7CC1C1276F92}"
+ RootNamespace="gio"
TargetFrameworkVersion="131072"
>
<Platforms>
@@ -28,19 +27,22 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN=\"Glib-GObject\""
+ AdditionalIncludeDirectories="../../../gio,../../../gmodule"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\"GLib-GIO\";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\"gio/modules\""
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
+ CompileAs="1"
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="$(IntDir)\gobject.def"
+ ModuleDefinitionFile="$(IntDir)\gio.def"
GenerateDebugInformation="true"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -58,23 +60,24 @@
>
<Tool
Name="VCCLCompilerTool"
- WholeProgramOptimization="false"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN=\"Glib-GObject\""
+ AdditionalIncludeDirectories="../../../gio,../../../gmodule"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\"GLib-GIO\";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\"gio/modules\""
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
+ CompileAs="1"
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1"
- ModuleDefinitionFile="$(IntDir)\gobject.def"
+ ModuleDefinitionFile="$(IntDir)\gio.def"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
@@ -90,19 +93,22 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN=\"Glib-GObject\""
+ AdditionalIncludeDirectories="../../../gio,../../../gmodule"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\"GLib-GIO\";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\"gio/modules\""
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
+ CompileAs="1"
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="$(IntDir)\gobject.def"
+ ModuleDefinitionFile="$(IntDir)\gio.def"
GenerateDebugInformation="true"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -120,23 +126,24 @@
>
<Tool
Name="VCCLCompilerTool"
- WholeProgramOptimization="false"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN=\"Glib-GObject\""
+ AdditionalIncludeDirectories="../../../gio,../../../gmodule"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\"GLib-GIO\";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\"gio/modules\""
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
+ CompileAs="1"
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1"
- ModuleDefinitionFile="$(IntDir)\gobject.def"
+ ModuleDefinitionFile="$(IntDir)\gio.def"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
@@ -152,70 +159,16 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File
- RelativePath="..\..\..\gobject\gatomicarray.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gboxed.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gclosure.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\genums.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gobject.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gparam.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gparamspecs.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gsignal.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gsourceclosure.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gtype.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gtypemodule.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gtypeplugin.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gvalue.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gvaluearray.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gvaluetransform.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gvaluetypes.c"
- >
- </File>
+#include "libgio.sourcefiles"
+ <File RelativePath="..\..\..\gio\gwin32appinfo.c" />
+ <File RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c" />
+ <File RelativePath="..\..\..\gio\gwin32mount.c" />
+ <File RelativePath="..\..\..\gio\gwin32resolver.c" />
+ <File RelativePath="..\..\..\gio\gwin32volumemonitor.c" />
+ <File RelativePath="..\..\..\gio\win32\gwinhttpfile.c" />
+ <File RelativePath="..\..\..\gio\win32\gwinhttpfileinputstream.c" />
+ <File RelativePath="..\..\..\gio\win32\gwinhttpfileoutputstream.c" />
+ <File RelativePath="..\..\..\gio\win32\gwinhttpvfs.c" />
</Filter>
<Filter
Name="Header Files"
@@ -229,20 +182,20 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
- RelativePath="..\..\..\gobject\gobject.rc"
+ RelativePath="..\..\..\gio\gio.rc"
>
</File>
<File
- RelativePath="..\..\..\gobject\gobject.symbols"
+ RelativePath="..\..\..\gio\gio.symbols"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
- Description="Generating gobject.def"
- CommandLine="$(GlibGenerateGobjectDef)"
- Outputs="$(IntDir)/gobject.def"
+ Description="Generating gio.def"
+ CommandLine="$(GlibGenerateGioDef)"
+ Outputs="$(IntDir)/gio.def"
/>
</FileConfiguration>
<FileConfiguration
@@ -250,9 +203,9 @@
>
<Tool
Name="VCCustomBuildTool"
- Description="Generating gobject.def"
- CommandLine="$(GlibGenerateGobjectDef)"
- Outputs="$(IntDir)/gobject.def"
+ Description="Generating gio.def"
+ CommandLine="$(GlibGenerateGioDef)"
+ Outputs="$(IntDir)/gio.def"
/>
</FileConfiguration>
<FileConfiguration
@@ -260,9 +213,9 @@
>
<Tool
Name="VCCustomBuildTool"
- Description="Generating gobject.def"
- CommandLine="$(GlibGenerateGobjectDef)"
- Outputs="$(IntDir)/gobject.def"
+ Description="Generating gio.def"
+ CommandLine="$(GlibGenerateGioDef)"
+ Outputs="$(IntDir)/gio.def"
/>
</FileConfiguration>
<FileConfiguration
@@ -270,9 +223,9 @@
>
<Tool
Name="VCCustomBuildTool"
- Description="Generating gobject.def"
- CommandLine="$(GlibGenerateGobjectDef)"
- Outputs="$(IntDir)/gobject.def"
+ Description="Generating gio.def"
+ CommandLine="$(GlibGenerateGioDef)"
+ Outputs="$(IntDir)/gio.def"
/>
</FileConfiguration>
</File>
diff --git a/build/win32/vs9/glib.vcproj b/build/win32/vs9/glib.vcprojin
similarity index 55%
rename from build/win32/vs9/glib.vcproj
rename to build/win32/vs9/glib.vcprojin
index 4aa8a64..560ca63 100644
--- a/build/win32/vs9/glib.vcproj
+++ b/build/win32/vs9/glib.vcprojin
@@ -156,207 +156,10 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File
- RelativePath="..\..\..\glib\garray.c"
- />
- <File
- RelativePath="..\..\..\glib\gasyncqueue.c"
- />
- <File
- RelativePath="..\..\..\glib\gatomic.c"
- />
- <File
- RelativePath="..\..\..\glib\gbacktrace.c"
- />
- <File
- RelativePath="..\..\..\glib\gbase64.c"
- />
- <File
- RelativePath="..\..\..\glib\gbitlock.c"
- />
- <File
- RelativePath="..\..\..\glib\gbookmarkfile.c"
- />
- <File
- RelativePath="..\..\..\glib\gbuffer.c"
- />
- <File
- RelativePath="..\..\..\glib\gcache.c"
- />
- <File
- RelativePath="..\..\..\glib\gchecksum.c"
- />
- <File
- RelativePath="..\..\..\glib\gcompletion.c"
- />
- <File
- RelativePath="..\..\..\glib\gconvert.c"
- />
- <File
- RelativePath="..\..\..\glib\gdataset.c"
- />
- <File
- RelativePath="..\..\..\glib\gdate.c"
- />
- <File
- RelativePath="..\..\..\glib\gdir.c"
- />
- <File
- RelativePath="..\..\..\glib\gerror.c"
- />
- <File
- RelativePath="..\..\..\glib\gfileutils.c"
- />
- <File
- RelativePath="..\..\..\glib\ghash.c"
- />
- <File
- RelativePath="..\..\..\glib\ghook.c"
- />
- <File
- RelativePath="..\..\..\glib\ghostutils.c"
- />
- <File
- RelativePath="..\..\..\glib\giochannel.c"
- />
- <File
- RelativePath="..\..\..\glib\giowin32.c"
- />
- <File
- RelativePath="..\..\..\glib\gkeyfile.c"
- />
- <File
- RelativePath="..\..\..\glib\glist.c"
- />
- <File
- RelativePath="..\..\..\glib\gmain.c"
- />
- <File
- RelativePath="..\..\..\glib\gmappedfile.c"
- />
- <File
- RelativePath="..\..\..\glib\gmarkup.c"
- />
- <File
- RelativePath="..\..\..\glib\gmem.c"
- />
- <File
- RelativePath="..\..\..\glib\gmessages.c"
- />
- <File
- RelativePath="..\..\..\glib\gnode.c"
- />
- <File
- RelativePath="..\..\..\glib\goption.c"
- />
- <File
- RelativePath="..\..\..\glib\gpattern.c"
- />
- <File
- RelativePath="..\..\..\glib\gpoll.c"
- />
- <File
- RelativePath="..\..\..\glib\gprimes.c"
- />
- <File
- RelativePath="..\..\..\glib\gprintf.c"
- />
- <File
- RelativePath="..\..\..\glib\gqsort.c"
- />
- <File
- RelativePath="..\..\..\glib\gqueue.c"
- />
- <File
- RelativePath="..\..\..\glib\grand.c"
- />
- <File
- RelativePath="..\..\..\glib\gregex.c"
- />
- <File
- RelativePath="..\..\..\glib\grel.c"
- />
- <File
- RelativePath="..\..\..\glib\gscanner.c"
- />
- <File
- RelativePath="..\..\..\glib\gsequence.c"
- />
- <File
- RelativePath="..\..\..\glib\gshell.c"
- />
- <File
- RelativePath="..\..\..\glib\gslice.c"
- />
- <File
- RelativePath="..\..\..\glib\gslist.c"
- />
- <File
- RelativePath="..\..\..\glib\gspawn-win32.c"
- />
- <File
- RelativePath="..\..\..\glib\gstdio.c"
- />
- <File
- RelativePath="..\..\..\glib\gstrfuncs.c"
- />
- <File
- RelativePath="..\..\..\glib\gstring.c"
- />
- <File
- RelativePath="..\..\..\glib\gtestutils.c"
- />
- <File
- RelativePath="..\..\..\glib\gthread.c"
- />
- <File
- RelativePath="..\..\..\glib\gthreadpool.c"
- />
- <File
- RelativePath="..\..\..\glib\gtimer.c"
- />
- <File
- RelativePath="..\..\..\glib\gtree.c"
- />
- <File
- RelativePath="..\..\..\glib\gunibreak.c"
- />
- <File
- RelativePath="..\..\..\glib\gunicollate.c"
- />
- <File
- RelativePath="..\..\..\glib\gunidecomp.c"
- />
- <File
- RelativePath="..\..\..\glib\guniprop.c"
- />
- <File
- RelativePath="..\..\..\glib\gurifuncs.c"
- />
- <File
- RelativePath="..\..\..\glib\gutf8.c"
- />
- <File
- RelativePath="..\..\..\glib\gutils.c"
- />
- <File
- RelativePath="..\..\..\glib\gvariant.c"
- />
- <File
- RelativePath="..\..\..\glib\gvariant-serialiser.c"
- />
- <File
- RelativePath="..\..\..\glib\gvarianttype.c"
- />
- <File
- RelativePath="..\..\..\glib\gvarianttypeinfo.c"
- />
- <File
- RelativePath="..\..\..\glib\gvariant-core.c"
- />
- <File
- RelativePath="..\..\..\glib\gwin32.c"
- />
+#include "libglib.sourcefiles"
+ <File RelativePath="..\..\..\glib\giowin32.c" />
+ <File RelativePath="..\..\..\glib\gspawn-win32.c" />
+ <File RelativePath="..\..\..\glib\gwin32.c" />
<Filter
Name="libcharset"
>
@@ -400,110 +203,35 @@
<Filter
Name="gnulib"
>
- <File
- RelativePath="..\..\..\glib\gnulib\asnprintf.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\gnulib\printf-args.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\gnulib\printf-parse.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\gnulib\printf.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\gnulib\vasnprintf.c"
- >
- </File>
+ <File RelativePath="..\..\..\glib\gnulib\asnprintf.c" />
+ <File RelativePath="..\..\..\glib\gnulib\printf-args.c" />
+ <File RelativePath="..\..\..\glib\gnulib\printf-parse.c" />
+ <File RelativePath="..\..\..\glib\gnulib\printf.c" />
+ <File RelativePath="..\..\..\glib\gnulib\vasnprintf.c" />
</Filter>
<Filter
Name="pcre"
>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_chartables.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_compile.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_config.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_dfa_exec.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_exec.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_fullinfo.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_get.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_globals.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_info.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_maketables.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_newline.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_ord2utf8.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_refcount.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_study.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_tables.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_try_flipped.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_ucp_searchfuncs.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_valid_utf8.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_version.c"
- >
- </File>
- <File
- RelativePath="..\..\..\glib\pcre\pcre_xclass.c"
- >
- </File>
+ <File RelativePath="..\..\..\glib\pcre\pcre_chartables.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_compile.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_config.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_dfa_exec.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_exec.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_fullinfo.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_get.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_globals.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_info.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_maketables.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_newline.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_ord2utf8.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_refcount.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_study.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_tables.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_try_flipped.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_ucp_searchfuncs.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_valid_utf8.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_version.c" />
+ <File RelativePath="..\..\..\glib\pcre\pcre_xclass.c" />
</Filter>
</Filter>
<Filter
diff --git a/build/win32/vs9/gobject.vcproj b/build/win32/vs9/gobject.vcprojin
similarity index 83%
rename from build/win32/vs9/gobject.vcproj
rename to build/win32/vs9/gobject.vcprojin
index a7d98c7..9f64f2f 100644
--- a/build/win32/vs9/gobject.vcproj
+++ b/build/win32/vs9/gobject.vcprojin
@@ -152,70 +152,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File
- RelativePath="..\..\..\gobject\gatomicarray.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gboxed.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gclosure.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\genums.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gobject.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gparam.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gparamspecs.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gsignal.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gsourceclosure.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gtype.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gtypemodule.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gtypeplugin.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gvalue.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gvaluearray.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gvaluetransform.c"
- >
- </File>
- <File
- RelativePath="..\..\..\gobject\gvaluetypes.c"
- >
- </File>
+#include "libgobject.sourcefiles"
</Filter>
<Filter
Name="Header Files"
diff --git a/gio/Makefile.am b/gio/Makefile.am
index b49d65c..fd42438 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -469,12 +469,21 @@ gio_querymodules_LDADD = \
libgio-2.0.la \
$(NULL)
-dist-hook: $(BUILT_EXTRA_DIST)
+dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done
+../build/win32/vs9/gio.vcproj: $(top_srcdir)/build/win32/vs9/gio.vcprojin
+ for F in $(libgio_2_0_la_SOURCES); do \
+ case $$F in \
+ *.c) echo ' <File RelativePath="..\..\..\gio\'$$F'" />' \
+ ;; \
+ esac; \
+ done >libgio.sourcefiles
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gio.vcprojin >$@
+
if HAVE_GLIB_RUNTIME_LIBDIR
install-data-hook:
mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 287301e..0654503 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -383,12 +383,21 @@ endif
glib-2.0.lib: libglib-2.0.la glib.def
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@
-dist-hook: $(BUILT_EXTRA_DIST)
+dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done
+../build/win32/vs9/glib.vcproj: $(top_srcdir)/build/win32/vs9/glib.vcprojin
+ for F in $(libglib_2_0_la_SOURCES); do \
+ case $$F in \
+ *.c) echo ' <File RelativePath="..\..\..\glib\'$$F'" />' \
+ ;; \
+ esac; \
+ done >libglib.sourcefiles
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib.vcprojin >$@
+
distclean-local:
if test $(srcdir) = .; then :; else \
rm -f libglib-gdb.py; \
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 928c616..5f31e2a 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -256,12 +256,21 @@ gobject-win32-res.o: gobject.rc
gobject-2.0.lib: libgobject-2.0.la gobject.def
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgobject-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gobject.def -out:$@
-dist-hook: $(BUILT_EXTRA_DIST)
+dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gobject.vcproj
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done
+../build/win32/vs9/gobject.vcproj: $(top_srcdir)/build/win32/vs9/gobject.vcprojin
+ for F in $(libgobject_2_0_la_SOURCES); do \
+ case $$F in \
+ *.c) echo ' <File RelativePath="..\..\..\gobject\'$$F'" />' \
+ ;; \
+ esac; \
+ done >libgobject.sourcefiles
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gobject.vcprojin >$@
+
install-data-local: install-ms-lib install-def-file
uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-gdb
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
