reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-24 04:10:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

makefiles: Allow define arguments to be specific to a single file.

Browse Source
This commit is contained in:
Alexandre Julliard 2014-01-07 12:20:25 +01:00
parent 1a74fdbcee
commit 0d533cf0bd
16 changed files with 56 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/actxprxy/Makefile.in
View File

@ -1,6 +1,5 @@
MODULE = actxprxy.dll
IMPORTS = uuid oleaut32 ole32 rpcrt4
EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION
C_SRCS = \
usrmarshal.c
@ -18,3 +17,5 @@ IDL_SRCS = \
actxprxy_shldisp.idl \
actxprxy_shobjidl.idl \
actxprxy_urlhist.idl
dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION

3
dlls/appwiz.cpl/Makefile.in
View File

@ -1,7 +1,6 @@
MODULE = appwiz.cpl
IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 user32 comdlg32
DELAYIMPORTS = msi
EXTRADEFS = -DINSTALL_DATADIR="\"${datadir}\""
C_SRCS = \
addons.c \
@ -11,3 +10,5 @@ RC_SRCS = appwiz.rc
SVG_SRCS = \
appwiz.svg
addons_EXTRADEFS = -DINSTALL_DATADIR="\"${datadir}\""

3
dlls/dispex/Makefile.in
View File

@ -1,9 +1,10 @@
MODULE = dispex.dll
IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32
EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION
C_SRCS = \
usrmarshal.c
IDL_SRCS = \
disp_ex.idl
dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION

3
dlls/msdaps/Makefile.in
View File

@ -1,6 +1,5 @@
MODULE = msdaps.dll
IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32
EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_
EXTRAIDLFLAGS = --win32-align=2
C_SRCS = \
@ -11,3 +10,5 @@ C_SRCS = \
IDL_SRCS = \
msdaps.idl \
row_server.idl
dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_

4
dlls/ole32/Makefile.in
View File

@ -2,7 +2,7 @@ MODULE = ole32.dll
IMPORTLIB = ole32
IMPORTS = uuid advapi32 user32 gdi32 rpcrt4
DELAYIMPORTS = oleaut32
EXTRADEFS = -D_OLE32_ -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer -DWINE_REGISTER_DLL
EXTRADEFS = -D_OLE32_
C_SRCS = \
antimoniker.c \
@ -49,3 +49,5 @@ IDL_SRCS = \
ole32_objidl.idl \
ole32_oleidl.idl \
ole32_unknwn.idl
dlldata_EXTRADEFS = -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer -DWINE_REGISTER_DLL

4
dlls/oleaut32/Makefile.in
View File

@ -2,7 +2,7 @@ MODULE = oleaut32.dll
IMPORTLIB = oleaut32
IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32
DELAYIMPORTS = comctl32 urlmon windowscodecs
EXTRADEFS = -D_OLEAUT32_ -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer
EXTRADEFS = -D_OLEAUT32_
C_SRCS = \
connpt.c \
@ -26,3 +26,5 @@ RC_SRCS = oleaut32.rc
IDL_SRCS = \
oleaut32_oaidl.idl \
oleaut32_ocidl.idl
dlldata_EXTRADEFS = -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer

3
dlls/qmgrprxy/Makefile.in
View File

@ -1,5 +1,6 @@
MODULE = qmgrprxy.dll
IMPORTS = rpcrt4
EXTRADEFS = -DWINE_REGISTER_DLL
IDL_SRCS = qmgrprxy.idl
dlldata_EXTRADEFS = -DWINE_REGISTER_DLL

3
dlls/quartz/Makefile.in
View File

@ -1,7 +1,6 @@
MODULE = quartz.dll
IMPORTLIB = quartz
IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32
EXTRADEFS = -DENTRY_PREFIX=QUARTZ_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL
C_SRCS = \
acmwrapper.c \
@ -33,3 +32,5 @@ IDL_SRCS = \
control_tlb.idl \
fil_data.idl \
quartz_strmif.idl
dlldata_EXTRADEFS = -DENTRY_PREFIX=QUARTZ_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL

3
dlls/sti/Makefile.in
View File

@ -1,10 +1,11 @@
MODULE = sti.dll
IMPORTLIB = sti
IMPORTS = uuid ole32 oleaut32 rpcrt4 advapi32
EXTRADEFS = -DENTRY_PREFIX=STI_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL
C_SRCS = \
sti.c \
sti_main.c
IDL_SRCS = sti_wia.idl
dlldata_EXTRADEFS = -DENTRY_PREFIX=STI_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL

6
dlls/urlmon/Makefile.in
View File

@ -1,8 +1,7 @@
MODULE = urlmon.dll
IMPORTLIB = urlmon
IMPORTS = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32
EXTRADEFS = -D_URLMON_ -DENTRY_PREFIX=URLMON_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL \
-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}"
EXTRADEFS = -D_URLMON_
DELAYIMPORTS = advpack
C_SRCS = \
@ -31,3 +30,6 @@ C_SRCS = \
RC_SRCS = urlmon.rc
IDL_SRCS = urlmon_urlmon.idl
dlldata_EXTRADEFS = -DENTRY_PREFIX=URLMON_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL \
-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}"

3
dlls/windowscodecs/Makefile.in
View File

@ -2,7 +2,6 @@ MODULE = windowscodecs.dll
IMPORTLIB = windowscodecs
IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32
EXTRAINCL = @JPEG_CFLAGS@ @PNG_CFLAGS@ @TIFF_CFLAGS@
EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL
EXTRALIBS = @APPLICATIONSERVICESLIB@
C_SRCS = \
@ -37,3 +36,5 @@ C_SRCS = \
RC_SRCS = version.rc
IDL_SRCS = windowscodecs_wincodec.idl
dlldata_EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL

18
libs/wine/Makefile.in
View File

@ -1,12 +1,5 @@
EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@
EXTRADEFS = -DWINE_UNICODE_API="" \
-DBINDIR='"${bindir}"' \
-DDLLDIR='"${dlldir}"' \
-DDLLPREFIX='"$(DLLPREFIX)"' \
-DLIB_TO_BINDIR=\"`$(MAKEDEP) -R ${libdir} ${bindir}`\" \
-DLIB_TO_DLLDIR=\"`$(MAKEDEP) -R ${libdir} ${dlldir}`\" \
-DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \
-DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\"
EXTRADEFS = -DWINE_UNICODE_API=""
STATICLIB = libwine_static.a
C_SRCS = \
@ -102,6 +95,15 @@ C_SRCS = \
EXTRA_OBJS = version.o
config_EXTRADEFS = \
-DBINDIR='"${bindir}"' \
-DDLLDIR='"${dlldir}"' \
-DDLLPREFIX='"$(DLLPREFIX)"' \
-DLIB_TO_BINDIR=\"`$(MAKEDEP) -R ${libdir} ${bindir}`\" \
-DLIB_TO_DLLDIR=\"`$(MAKEDEP) -R ${libdir} ${dlldir}`\" \
-DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \
-DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\"
@MAKE_RULES@
version.c: dummy

8
tools/makedep.c
View File

@ -1422,6 +1422,7 @@ static struct strarray output_sources(void)
LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry )
{
struct strarray extradefs;
char *sourcedep;
char *obj = xstrdup( source->name );
char *ext = get_extension( obj );
@ -1438,6 +1439,8 @@ static struct strarray output_sources(void)
}
else sourcedep = xstrdup( source->filename );
extradefs = get_expanded_make_var_array( strmake( "%s_EXTRADEFS", obj ));
if (!strcmp( ext, "y" )) /* yacc file */
{
/* add source file dependency for parallel makes */
@ -1480,6 +1483,7 @@ static struct strarray output_sources(void)
else output_filenames( targetflags );
output_filenames( includes );
output_filenames( define_args );
output_filenames( extradefs );
output_filename( "$(RCFLAGS)" );
output( "\n" );
output( "%s.res rsrc.pot:", obj );
@ -1493,6 +1497,7 @@ static struct strarray output_sources(void)
else output_filenames( targetflags );
output_filenames( includes );
output_filenames( define_args );
output_filenames( extradefs );
output_filename( "$(RCFLAGS)" );
output( "\n" );
output( "%s.res:", obj );
@ -1530,6 +1535,7 @@ static struct strarray output_sources(void)
output_filenames( targetflags );
output_filenames( includes );
output_filenames( define_args );
output_filenames( extradefs );
output_filename( "$(IDLFLAGS)" );
output( "\n" );
output_filenames( targets );
@ -1607,6 +1613,7 @@ static struct strarray output_sources(void)
output( "\t$(CC) -c -o $@ %s", source->filename );
output_filenames( includes );
output_filenames( define_args );
output_filenames( extradefs );
if (module || staticlib || testdll) output_filenames( dllflags );
output_filename( "$(ALLCFLAGS)" );
output( "\n" );
@ -1617,6 +1624,7 @@ static struct strarray output_sources(void)
output( "\t$(CROSSCC) -c -o $@ %s", source->filename );
output_filenames( includes );
output_filenames( define_args );
output_filenames( extradefs );
output_filename( "-DWINE_CROSSTEST" );
output_filename( "$(ALLCROSSCFLAGS)" );
output( "\n" );

2
tools/widl/Makefile.in
View File

@ -19,7 +19,7 @@ C_SRCS = \
LEX_SRCS = parser.l
BISON_SRCS = parser.y
EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/windows/\"
widl_EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/windows/\"
@MAKE_RULES@

18
tools/winegcc/Makefile.in
View File

@ -1,12 +1,3 @@
EXTRADEFS = \
-DINCLUDEDIR="\"${includedir}\"" \
-DDLLDIR="\"${dlldir}\"" \
-DLIBDIR="\"${libdir}\"" \
-DCC="\"$(CC)\"" \
-DCPP="\"@CPPBIN@\"" \
-DCXX="\"@CXX@\"" \
-DPRELINK="\"$(PRELINK)\""
PROGRAMS = \
winecpp$(EXEEXT) \
winegcc$(EXEEXT) \
@ -18,6 +9,15 @@ C_SRCS = \
utils.c \
winegcc.c
winegcc_EXTRADEFS = \
-DINCLUDEDIR="\"${includedir}\"" \
-DDLLDIR="\"${dlldir}\"" \
-DLIBDIR="\"${libdir}\"" \
-DCC="\"$(CC)\"" \
-DCPP="\"@CPPBIN@\"" \
-DCXX="\"@CXX@\"" \
-DPRELINK="\"$(PRELINK)\""
@MAKE_RULES@
winegcc$(EXEEXT): winegcc.o utils.o

3
tools/wrc/Makefile.in
View File

@ -1,4 +1,3 @@
EXTRADEFS = -DINCLUDEDIR="\"${includedir}\""
PROGRAMS = wrc$(EXEEXT)
MANPAGES = wrc.man.in
ALL_LIBS = @LIBGETTEXTPO@ $(LIBWPP) $(LIBWINE_STATIC) $(LIBPORT)
@ -17,6 +16,8 @@ C_SRCS = \
LEX_SRCS = parser.l
BISON_SRCS = parser.y
wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}\""
@MAKE_RULES@
wrc$(EXEEXT): $(OBJS) $(LIBWPP)