Commit 3c81449d authored by Alexandre Julliard's avatar Alexandre Julliard

makefiles: Allow including files with relative paths.

parent 15d5cb22
...@@ -3,8 +3,6 @@ MODULE = shell32.dll ...@@ -3,8 +3,6 @@ MODULE = shell32.dll
IMPORTLIB = shell32 IMPORTLIB = shell32
IMPORTS = uuid shlwapi user32 gdi32 advapi32 IMPORTS = uuid shlwapi user32 gdi32 advapi32
DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus
# AUTHORS file is in the top-level directory
EXTRAINCL = -I$(top_srcdir)
C_SRCS = \ C_SRCS = \
appbar.c \ appbar.c \
......
...@@ -1101,8 +1101,8 @@ IDR_AVI_FILENUKE AVI resources/searching.avi ...@@ -1101,8 +1101,8 @@ IDR_AVI_FILENUKE AVI resources/searching.avi
/* @makedep: resources/searching.avi */ /* @makedep: resources/searching.avi */
IDR_AVI_FILEDELETE AVI resources/searching.avi IDR_AVI_FILEDELETE AVI resources/searching.avi
/* @makedep: AUTHORS */ /* @makedep: ../../AUTHORS */
AUTHORS RCDATA AUTHORS AUTHORS RCDATA ../../AUTHORS
/* @makedep: shell32.manifest */ /* @makedep: shell32.manifest */
124 RT_MANIFEST shell32.manifest 124 RT_MANIFEST shell32.manifest
......
...@@ -909,9 +909,6 @@ static void add_dependency( struct file *file, const char *name, enum incl_type ...@@ -909,9 +909,6 @@ static void add_dependency( struct file *file, const char *name, enum incl_type
{ {
/* enforce some rules for the Wine tree */ /* enforce some rules for the Wine tree */
if (!memcmp( name, "../", 3 ))
fatal_error( "#include directive with relative path not allowed\n" );
if (!strcmp( name, "config.h" )) if (!strcmp( name, "config.h" ))
{ {
if (strendswith( file->name, ".h" )) if (strendswith( file->name, ".h" ))
...@@ -1456,6 +1453,7 @@ static struct file *open_global_file( const struct makefile *make, const char *p ...@@ -1456,6 +1453,7 @@ static struct file *open_global_file( const struct makefile *make, const char *p
*/ */
static struct file *open_global_header( const struct makefile *make, const char *path, char **filename ) static struct file *open_global_header( const struct makefile *make, const char *path, char **filename )
{ {
if (!strncmp( path, "../", 3 )) return NULL;
return open_global_file( make, strmake( "include/%s", path ), filename ); return open_global_file( make, strmake( "include/%s", path ), filename );
} }
......
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