Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
456c8f43
Commit
456c8f43
authored
Nov 09, 2013
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Remove the no longer needed EXTRASUBDIRS variables.
parent
31eb8be6
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
33 additions
and
87 deletions
+33
-87
Make.rules.in
Make.rules.in
+2
-6
Makefile.in
Makefile.in
+0
-7
aclocal.m4
aclocal.m4
+4
-5
configure
configure
+17
-27
configure.ac
configure.ac
+8
-5
Makefile.in
dlls/gdi32/Makefile.in
+0
-5
Makefile.in
dlls/kernel32/Makefile.in
+0
-2
Makefile.in
dlls/user32/Makefile.in
+0
-2
Makefile.in
dlls/wineps.drv/Makefile.in
+0
-2
Makefile.in
include/Makefile.in
+0
-6
Makefile.in
tools/Makefile.in
+0
-2
make_makefiles
tools/make_makefiles
+2
-18
No files found.
Make.rules.in
View file @
456c8f43
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
# EXTRA_OBJS : extra object files
# EXTRA_OBJS : extra object files
# IMPORTS : dlls to import
# IMPORTS : dlls to import
# DELAYIMPORTS : dlls to import in delayed mode
# DELAYIMPORTS : dlls to import in delayed mode
# EXTRASUBDIRS : subdirectories that do not contain a Makefile
# MODCFLAGS : extra CFLAGS for this module
# MODCFLAGS : extra CFLAGS for this module
# First some useful definitions
# First some useful definitions
...
@@ -154,13 +153,10 @@ xmlpages:: $(C_SRCS) dummy
...
@@ -154,13 +153,10 @@ xmlpages:: $(C_SRCS) dummy
# Rules for cleaning
# Rules for cleaning
$(EXTRASUBDIRS:%=%/clean): dummy
clean::
-cd `dirname $@` && $(RM) $(CLEAN_FILES)
clean:: $(EXTRASUBDIRS:%=%/clean)
$(RM) $(CLEAN_FILES) $(CLEAN_TARGETS) $(PROGRAMS) $(MANPAGES)
$(RM) $(CLEAN_FILES) $(CLEAN_TARGETS) $(PROGRAMS) $(MANPAGES)
.PHONY: clean
$(EXTRASUBDIRS:%=%/clean)
.PHONY: clean
# Rules for installing
# Rules for installing
...
...
Makefile.in
View file @
456c8f43
...
@@ -18,13 +18,6 @@
...
@@ -18,13 +18,6 @@
# sgmlpages: compile sgml source for the Wine API Guide
# sgmlpages: compile sgml source for the Wine API Guide
# xmlpages: compile xml source for the Wine API Guide
# xmlpages: compile xml source for the Wine API Guide
# Sub-directories that don't have a makefile
EXTRASUBDIRS
=
\
dlls
\
libs
\
po
\
programs
# Destination directories for make install
# Destination directories for make install
INSTALLDIRS
=
\
INSTALLDIRS
=
\
$(DESTDIR)$(bindir)
\
$(DESTDIR)$(bindir)
\
...
...
aclocal.m4
View file @
456c8f43
...
@@ -491,7 +491,9 @@ clean::
...
@@ -491,7 +491,9 @@ clean::
wine_fn_append_rule \
wine_fn_append_rule \
"__builddeps__: dlls/lib$ac_implib.cross.a
"__builddeps__: dlls/lib$ac_implib.cross.a
dlls/lib$ac_implib.cross.a: $ac_file.cross.a
dlls/lib$ac_implib.cross.a: $ac_file.cross.a
\$(RM) \$[@] && \$(LN_S) $ac_name/lib$ac_implib.cross.a \$[@]"
\$(RM) \$[@] && \$(LN_S) $ac_name/lib$ac_implib.cross.a \$[@]
clean::
\$(RM) dlls/lib$ac_implib.cross.a"
fi
fi
fi
fi
fi
fi
...
@@ -671,10 +673,7 @@ dnl
...
@@ -671,10 +673,7 @@ dnl
dnl Usage: WINE_CONFIG_EXTRA_DIR(dirname)
dnl Usage: WINE_CONFIG_EXTRA_DIR(dirname)
dnl
dnl
AC_DEFUN([WINE_CONFIG_EXTRA_DIR],
AC_DEFUN([WINE_CONFIG_EXTRA_DIR],
[AC_CONFIG_COMMANDS([$1],[test -d "$1" || { AC_MSG_NOTICE([creating $1]); AS_MKDIR_P("$1"); }])dnl
[AC_CONFIG_COMMANDS([$1],[test -d "$1" || { AC_MSG_NOTICE([creating $1]); AS_MKDIR_P("$1"); }])])
wine_fn_append_rule \
"clean::
\$(RM) \$(CLEAN_FILES:%=[$1]/%)"])
dnl **** Create symlinks from config.status ****
dnl **** Create symlinks from config.status ****
dnl
dnl
...
...
configure
View file @
456c8f43
...
@@ -16410,7 +16410,9 @@ clean::
...
@@ -16410,7 +16410,9 @@ clean::
wine_fn_append_rule
\
wine_fn_append_rule
\
"__builddeps__: dlls/lib
$ac_implib
.cross.a
"__builddeps__: dlls/lib
$ac_implib
.cross.a
dlls/lib
$ac_implib
.cross.a:
$ac_file
.cross.a
dlls/lib
$ac_implib
.cross.a:
$ac_file
.cross.a
\$
(RM)
\$
@ &&
\$
(LN_S)
$ac_name
/lib
$ac_implib
.cross.a
\$
@"
\$
(RM)
\$
@ &&
\$
(LN_S)
$ac_name
/lib
$ac_implib
.cross.a
\$
@
clean::
\$
(RM) dlls/lib
$ac_implib
.cross.a"
fi
fi
fi
fi
fi
fi
...
@@ -16608,33 +16610,19 @@ wine_fn_config_symlink wine64
...
@@ -16608,33 +16610,19 @@ wine_fn_config_symlink wine64
fi
fi
ac_config_commands
=
"
$ac_config_commands
dlls/gdi32/dibdrv"
ac_config_commands
=
"
$ac_config_commands
dlls/gdi32/dibdrv"
wine_fn_append_rule
\
"clean::
\$
(RM)
\$
(CLEAN_FILES:%=dlls/gdi32/dibdrv/%)"
ac_config_commands
=
"
$ac_config_commands
dlls/gdi32/enhmfdrv"
ac_config_commands
=
"
$ac_config_commands
dlls/gdi32/enhmfdrv"
wine_fn_append_rule
\
"clean::
\$
(RM)
\$
(CLEAN_FILES:%=dlls/gdi32/enhmfdrv/%)"
ac_config_commands
=
"
$ac_config_commands
dlls/gdi32/mfdrv"
ac_config_commands
=
"
$ac_config_commands
dlls/gdi32/mfdrv"
wine_fn_append_rule
\
"clean::
\$
(RM)
\$
(CLEAN_FILES:%=dlls/gdi32/mfdrv/%)"
ac_config_commands
=
"
$ac_config_commands
dlls/kernel32/nls"
ac_config_commands
=
"
$ac_config_commands
dlls/kernel32/nls"
wine_fn_append_rule
\
"clean::
\$
(RM)
\$
(CLEAN_FILES:%=dlls/kernel32/nls/%)"
ac_config_commands
=
"
$ac_config_commands
dlls/user32/resources"
ac_config_commands
=
"
$ac_config_commands
dlls/user32/resources"
wine_fn_append_rule
\
"clean::
\$
(RM)
\$
(CLEAN_FILES:%=dlls/user32/resources/%)"
ac_config_commands
=
"
$ac_config_commands
dlls/wineps.drv/data"
ac_config_commands
=
"
$ac_config_commands
dlls/wineps.drv/data"
wine_fn_append_rule
\
"clean::
\$
(RM)
\$
(CLEAN_FILES:%=dlls/wineps.drv/data/%)"
ac_config_commands
=
"
$ac_config_commands
include/wine"
ac_config_commands
=
"
$ac_config_commands
include/wine"
wine_fn_append_rule
\
"clean::
\$
(RM)
\$
(CLEAN_FILES:%=include/wine/%)"
wine_fn_config_makerules Make.rules
wine_fn_config_makerules Make.rules
MAKE_RULES
=
Make.rules
MAKE_RULES
=
Make.rules
...
@@ -16850,7 +16838,7 @@ wine_fn_config_dll fwpuclnt enable_fwpuclnt
...
@@ -16850,7 +16838,7 @@ wine_fn_config_dll fwpuclnt enable_fwpuclnt
wine_fn_config_dll gameux enable_gameux clean
wine_fn_config_dll gameux enable_gameux clean
wine_fn_config_test dlls/gameux/tests gameux_test
wine_fn_config_test dlls/gameux/tests gameux_test
wine_fn_config_dll gdi.exe16 enable_win16
wine_fn_config_dll gdi.exe16 enable_win16
wine_fn_config_dll gdi32 enable_gdi32 implib,po
wine_fn_config_dll gdi32 enable_gdi32
clean,
implib,po
wine_fn_config_test dlls/gdi32/tests gdi32_test
wine_fn_config_test dlls/gdi32/tests gdi32_test
wine_fn_config_dll gdiplus enable_gdiplus implib
wine_fn_config_dll gdiplus enable_gdiplus implib
wine_fn_config_test dlls/gdiplus/tests gdiplus_test
wine_fn_config_test dlls/gdiplus/tests gdiplus_test
...
@@ -16893,7 +16881,7 @@ wine_fn_config_test dlls/itss/tests itss_test
...
@@ -16893,7 +16881,7 @@ wine_fn_config_test dlls/itss/tests itss_test
wine_fn_config_dll joy.cpl enable_joy_cpl po
wine_fn_config_dll joy.cpl enable_joy_cpl po
wine_fn_config_dll jscript enable_jscript clean,po
wine_fn_config_dll jscript enable_jscript clean,po
wine_fn_config_test dlls/jscript/tests jscript_test
wine_fn_config_test dlls/jscript/tests jscript_test
wine_fn_config_dll kernel32 enable_kernel32 implib,mc
wine_fn_config_dll kernel32 enable_kernel32
clean,
implib,mc
wine_fn_config_test dlls/kernel32/tests kernel32_test
wine_fn_config_test dlls/kernel32/tests kernel32_test
wine_fn_config_dll keyboard.drv16 enable_win16
wine_fn_config_dll keyboard.drv16 enable_win16
wine_fn_config_dll krnl386.exe16 enable_win16 implib kernel
wine_fn_config_dll krnl386.exe16 enable_win16 implib kernel
...
@@ -17150,7 +17138,7 @@ wine_fn_config_dll urlmon enable_urlmon clean,implib,po
...
@@ -17150,7 +17138,7 @@ wine_fn_config_dll urlmon enable_urlmon clean,implib,po
wine_fn_config_test dlls/urlmon/tests urlmon_test
wine_fn_config_test dlls/urlmon/tests urlmon_test
wine_fn_config_dll usbd.sys enable_usbd_sys implib
wine_fn_config_dll usbd.sys enable_usbd_sys implib
wine_fn_config_dll user.exe16 enable_win16
wine_fn_config_dll user.exe16 enable_win16
wine_fn_config_dll user32 enable_user32 implib,po
wine_fn_config_dll user32 enable_user32
clean,
implib,po
wine_fn_config_test dlls/user32/tests user32_test
wine_fn_config_test dlls/user32/tests user32_test
wine_fn_config_dll userenv enable_userenv implib
wine_fn_config_dll userenv enable_userenv implib
wine_fn_config_test dlls/userenv/tests userenv_test
wine_fn_config_test dlls/userenv/tests userenv_test
...
@@ -17202,7 +17190,7 @@ wine_fn_config_dll winemac.drv enable_winemac_drv
...
@@ -17202,7 +17190,7 @@ wine_fn_config_dll winemac.drv enable_winemac_drv
wine_fn_config_dll winemapi enable_winemapi
wine_fn_config_dll winemapi enable_winemapi
wine_fn_config_dll winemp3.acm enable_winemp3_acm
wine_fn_config_dll winemp3.acm enable_winemp3_acm
wine_fn_config_dll wineoss.drv enable_wineoss_drv
wine_fn_config_dll wineoss.drv enable_wineoss_drv
wine_fn_config_dll wineps.drv enable_wineps_drv po
wine_fn_config_dll wineps.drv enable_wineps_drv
clean,
po
wine_fn_config_dll wineps16.drv16 enable_win16
wine_fn_config_dll wineps16.drv16 enable_win16
wine_fn_config_dll wineqtdecoder enable_wineqtdecoder
wine_fn_config_dll wineqtdecoder enable_wineqtdecoder
wine_fn_config_dll winex11.drv enable_winex11_drv
wine_fn_config_dll winex11.drv enable_winex11_drv
...
@@ -17437,7 +17425,9 @@ if test "$MSGFMT" != false
...
@@ -17437,7 +17425,9 @@ if test "$MSGFMT" != false
then
then
PORCFLAGS
=
"--po-dir=
\$
(top_builddir)/po"
PORCFLAGS
=
"--po-dir=
\$
(top_builddir)/po"
wine_fn_append_rule
"__builddeps__:
\$
(ALL_MO_FILES)"
wine_fn_append_rule
"__builddeps__:
\$
(ALL_MO_FILES)
clean::
\$
(RM)
\$
(ALL_MO_FILES)"
else
else
LINGUAS
=
LINGUAS
=
fi
fi
...
...
configure.ac
View file @
456c8f43
...
@@ -2891,7 +2891,7 @@ WINE_CONFIG_DLL(fwpuclnt)
...
@@ -2891,7 +2891,7 @@ WINE_CONFIG_DLL(fwpuclnt)
WINE_CONFIG_DLL(gameux,,[clean])
WINE_CONFIG_DLL(gameux,,[clean])
WINE_CONFIG_TEST(dlls/gameux/tests)
WINE_CONFIG_TEST(dlls/gameux/tests)
WINE_CONFIG_DLL(gdi.exe16,enable_win16)
WINE_CONFIG_DLL(gdi.exe16,enable_win16)
WINE_CONFIG_DLL(gdi32,,[implib,po])
WINE_CONFIG_DLL(gdi32,,[
clean,
implib,po])
WINE_CONFIG_TEST(dlls/gdi32/tests)
WINE_CONFIG_TEST(dlls/gdi32/tests)
WINE_CONFIG_DLL(gdiplus,,[implib])
WINE_CONFIG_DLL(gdiplus,,[implib])
WINE_CONFIG_TEST(dlls/gdiplus/tests)
WINE_CONFIG_TEST(dlls/gdiplus/tests)
...
@@ -2934,7 +2934,7 @@ WINE_CONFIG_TEST(dlls/itss/tests)
...
@@ -2934,7 +2934,7 @@ WINE_CONFIG_TEST(dlls/itss/tests)
WINE_CONFIG_DLL(joy.cpl,,[po])
WINE_CONFIG_DLL(joy.cpl,,[po])
WINE_CONFIG_DLL(jscript,,[clean,po])
WINE_CONFIG_DLL(jscript,,[clean,po])
WINE_CONFIG_TEST(dlls/jscript/tests)
WINE_CONFIG_TEST(dlls/jscript/tests)
WINE_CONFIG_DLL(kernel32,,[implib,mc])
WINE_CONFIG_DLL(kernel32,,[
clean,
implib,mc])
WINE_CONFIG_TEST(dlls/kernel32/tests)
WINE_CONFIG_TEST(dlls/kernel32/tests)
WINE_CONFIG_DLL(keyboard.drv16,enable_win16)
WINE_CONFIG_DLL(keyboard.drv16,enable_win16)
WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[implib],[kernel])
WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[implib],[kernel])
...
@@ -3191,7 +3191,7 @@ WINE_CONFIG_DLL(urlmon,,[clean,implib,po])
...
@@ -3191,7 +3191,7 @@ WINE_CONFIG_DLL(urlmon,,[clean,implib,po])
WINE_CONFIG_TEST(dlls/urlmon/tests)
WINE_CONFIG_TEST(dlls/urlmon/tests)
WINE_CONFIG_DLL(usbd.sys,,[implib])
WINE_CONFIG_DLL(usbd.sys,,[implib])
WINE_CONFIG_DLL(user.exe16,enable_win16)
WINE_CONFIG_DLL(user.exe16,enable_win16)
WINE_CONFIG_DLL(user32,,[implib,po])
WINE_CONFIG_DLL(user32,,[
clean,
implib,po])
WINE_CONFIG_TEST(dlls/user32/tests)
WINE_CONFIG_TEST(dlls/user32/tests)
WINE_CONFIG_DLL(userenv,,[implib])
WINE_CONFIG_DLL(userenv,,[implib])
WINE_CONFIG_TEST(dlls/userenv/tests)
WINE_CONFIG_TEST(dlls/userenv/tests)
...
@@ -3243,7 +3243,7 @@ WINE_CONFIG_DLL(winemac.drv)
...
@@ -3243,7 +3243,7 @@ WINE_CONFIG_DLL(winemac.drv)
WINE_CONFIG_DLL(winemapi)
WINE_CONFIG_DLL(winemapi)
WINE_CONFIG_DLL(winemp3.acm)
WINE_CONFIG_DLL(winemp3.acm)
WINE_CONFIG_DLL(wineoss.drv)
WINE_CONFIG_DLL(wineoss.drv)
WINE_CONFIG_DLL(wineps.drv,,[po])
WINE_CONFIG_DLL(wineps.drv,,[
clean,
po])
WINE_CONFIG_DLL(wineps16.drv16,enable_win16)
WINE_CONFIG_DLL(wineps16.drv16,enable_win16)
WINE_CONFIG_DLL(wineqtdecoder)
WINE_CONFIG_DLL(wineqtdecoder)
WINE_CONFIG_DLL(winex11.drv)
WINE_CONFIG_DLL(winex11.drv)
...
@@ -3485,7 +3485,10 @@ fi
...
@@ -3485,7 +3485,10 @@ fi
if test "$MSGFMT" != false
if test "$MSGFMT" != false
then
then
AC_SUBST([PORCFLAGS],["--po-dir=\$(top_builddir)/po"])
AC_SUBST([PORCFLAGS],["--po-dir=\$(top_builddir)/po"])
WINE_APPEND_RULE([__builddeps__: \$(ALL_MO_FILES)])
WINE_APPEND_RULE(
[__builddeps__: \$(ALL_MO_FILES)
clean::
\$(RM) \$(ALL_MO_FILES)])
else
else
LINGUAS=
LINGUAS=
fi
fi
...
...
dlls/gdi32/Makefile.in
View file @
456c8f43
...
@@ -50,9 +50,4 @@ C_SRCS = \
...
@@ -50,9 +50,4 @@ C_SRCS = \
RC_SRCS
=
gdi32.rc
RC_SRCS
=
gdi32.rc
PO_SRCS
=
gdi32.rc
PO_SRCS
=
gdi32.rc
EXTRASUBDIRS
=
\
dibdrv
\
enhmfdrv
\
mfdrv
@MAKE_DLL_RULES@
@MAKE_DLL_RULES@
dlls/kernel32/Makefile.in
View file @
456c8f43
...
@@ -52,6 +52,4 @@ RC_SRCS = \
...
@@ -52,6 +52,4 @@ RC_SRCS = \
MC_SRCS
=
\
MC_SRCS
=
\
winerror.mc
winerror.mc
EXTRASUBDIRS
=
nls
@MAKE_DLL_RULES@
@MAKE_DLL_RULES@
dlls/user32/Makefile.in
View file @
456c8f43
...
@@ -61,6 +61,4 @@ SVG_SRCS = \
...
@@ -61,6 +61,4 @@ SVG_SRCS = \
resources/oic_sample.svg
\
resources/oic_sample.svg
\
resources/oic_winlogo.svg
resources/oic_winlogo.svg
EXTRASUBDIRS
=
resources
@MAKE_DLL_RULES@
@MAKE_DLL_RULES@
dlls/wineps.drv/Makefile.in
View file @
456c8f43
...
@@ -64,6 +64,4 @@ C_SRCS = \
...
@@ -64,6 +64,4 @@ C_SRCS = \
PO_SRCS
=
wineps.rc
PO_SRCS
=
wineps.rc
RC_SRCS
=
wineps.rc
RC_SRCS
=
wineps.rc
EXTRASUBDIRS
=
data
@MAKE_DLL_RULES@
@MAKE_DLL_RULES@
include/Makefile.in
View file @
456c8f43
...
@@ -622,12 +622,6 @@ SRCDIR_INCLUDES = \
...
@@ -622,12 +622,6 @@ SRCDIR_INCLUDES = \
xmldsodid.h
\
xmldsodid.h
\
zmouse.h
zmouse.h
EXTRASUBDIRS
=
\
ddk
\
msvcrt
\
msvcrt/sys
\
wine
INSTALLDIRS
=
\
INSTALLDIRS
=
\
$(DESTDIR)$(includedir)
/windows/ddk
\
$(DESTDIR)$(includedir)
/windows/ddk
\
$(DESTDIR)$(includedir)
/windows
\
$(DESTDIR)$(includedir)
/windows
\
...
...
tools/Makefile.in
View file @
456c8f43
...
@@ -21,8 +21,6 @@ C_SRCS = \
...
@@ -21,8 +21,6 @@ C_SRCS = \
makedep.c
\
makedep.c
\
sfnt2fnt.c
sfnt2fnt.c
EXTRASUBDIRS
=
winapi
INSTALLDIRS
=
\
INSTALLDIRS
=
\
$(DESTDIR)$(bindir)
\
$(DESTDIR)$(bindir)
\
$(DESTDIR)$(datadir)
/applications
\
$(DESTDIR)$(datadir)
/applications
\
...
...
tools/make_makefiles
View file @
456c8f43
...
@@ -391,8 +391,6 @@ sub get_makedep_flags($)
...
@@ -391,8 +391,6 @@ sub get_makedep_flags($)
# assign source files to their respective makefile
# assign source files to their respective makefile
sub
assign_sources_to_makefiles
(@)
sub
assign_sources_to_makefiles
(@)
{
{
my
%
subdirs
;
foreach
my
$file
(
@_
)
foreach
my
$file
(
@_
)
{
{
next
if
defined
$ignored_source_files
{
$file
};
next
if
defined
$ignored_source_files
{
$file
};
...
@@ -401,22 +399,15 @@ sub assign_sources_to_makefiles(@)
...
@@ -401,22 +399,15 @@ sub assign_sources_to_makefiles(@)
while
(
$dir
&&
!
defined
$makefiles
{
"$dir/Makefile"
})
{
$dir
=
dirname
(
$dir
);
}
while
(
$dir
&&
!
defined
$makefiles
{
"$dir/Makefile"
})
{
$dir
=
dirname
(
$dir
);
}
$subdir
=~
s/^$dir\/?//
;
$subdir
=~
s/^$dir\/?//
;
$subdirs
{
"$dir/ $subdir"
}
=
1
if
$subdir
;
next
unless
$dir
;
next
unless
$dir
;
my
$basedir
=
dirname
(
$dir
);
if
(
$basedir
&&
!
defined
$makefiles
{
"$basedir/Makefile"
})
{
$subdir
=
$basedir
;
$basedir
=
dirname
(
$basedir
);
$subdirs
{
"$basedir/ $subdir"
}
=
1
;
}
die
"no makefile found for $file\n"
unless
defined
$makefiles
{
"$dir/Makefile"
};
die
"no makefile found for $file\n"
unless
defined
$makefiles
{
"$dir/Makefile"
};
my
$make
=
$makefiles
{
"$dir/Makefile"
};
my
$make
=
$makefiles
{
"$dir/Makefile"
};
my
$name
=
substr
(
$file
,
length
(
$dir
)
+
1
);
my
$name
=
substr
(
$file
,
length
(
$dir
)
+
1
);
$
{
$make
}{
"=flags"
}{
"clean"
}
=
1
if
$subdir
;
if
(
$dir
eq
"include"
)
if
(
$dir
eq
"include"
)
{
{
next
if
(
$name
=~
/\.in$/
);
next
if
(
$name
=~
/\.in$/
);
...
@@ -465,12 +456,6 @@ sub assign_sources_to_makefiles(@)
...
@@ -465,12 +456,6 @@ sub assign_sources_to_makefiles(@)
}
}
}
}
}
}
foreach
my
$key
(
keys
%
subdirs
)
{
my
(
$dir
,
$subdir
)
=
split
" "
,
$key
;
if
(
$dir
eq
"/"
)
{
$dir
=
""
;
}
push
@
{
$
{
$makefiles
{
"${dir}Makefile"
}}{
"=EXTRASUBDIRS"
}},
$subdir
;
}
# add extra variables to include source list
# add extra variables to include source list
my
$make
=
$makefiles
{
"include/Makefile"
};
my
$make
=
$makefiles
{
"include/Makefile"
};
...
@@ -583,7 +568,6 @@ sub update_makefiles(@)
...
@@ -583,7 +568,6 @@ sub update_makefiles(@)
replace_makefile_variable
(
$file
,
"IDL_TLB_SRCS"
);
replace_makefile_variable
(
$file
,
"IDL_TLB_SRCS"
);
replace_makefile_variable
(
$file
,
"XTEMPLATE_SRCS"
);
replace_makefile_variable
(
$file
,
"XTEMPLATE_SRCS"
);
replace_makefile_variable
(
$file
,
"SRCDIR_INCLUDES"
);
replace_makefile_variable
(
$file
,
"SRCDIR_INCLUDES"
);
replace_makefile_variable
(
$file
,
"EXTRASUBDIRS"
);
}
}
push
@lines
,
"dnl End of auto-generated output commands\n"
;
push
@lines
,
"dnl End of auto-generated output commands\n"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment