fix to include correct files.lst for wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -157,7 +157,7 @@ WX_LINGUAS = `cd $(top_srcdir)/locale && ls *.mo 2> /dev/null | sed -n 's/\.mo//
|
||||
# this line will include a file which defines ALL_SOURCES, ALL_OBJECTS,
|
||||
# ALL_DEPFILES and ALL_HEADERS variables with the complete list of .cpp, .o,
|
||||
# .d and .h/.inl files for the current toolkit
|
||||
include $(top_srcdir)/@PORT_FILES@
|
||||
include @PORT_FILES@
|
||||
|
||||
SOURCES = $(ALL_SOURCES)
|
||||
HEADERS = $(ALL_HEADERS)
|
||||
|
4
configure
vendored
4
configure
vendored
@@ -10508,9 +10508,9 @@ rm -f conftest*
|
||||
ALL_DEPFILES="${ALL_DEPFILES} \$(HTMLDEPS)"
|
||||
fi
|
||||
|
||||
PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
|
||||
PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst"
|
||||
if test "$wxUSE_UNIVERSAL" = "yes"; then
|
||||
PORT_FILES="\${top_srcdir}/src/univ/files.lst ${PORT_FILES}"
|
||||
PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
|
||||
fi
|
||||
RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
|
||||
RPM_SPEC="wx\$(TOOLKIT).spec"
|
||||
|
@@ -2056,10 +2056,9 @@ equivalent variable and GTK+ is version 1.2.3 or above.
|
||||
fi
|
||||
|
||||
dnl misc other files depending on the port
|
||||
PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
|
||||
PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst"
|
||||
if test "$wxUSE_UNIVERSAL" = "yes"; then
|
||||
dnl put univ files first!
|
||||
PORT_FILES="\${top_srcdir}/src/univ/files.lst ${PORT_FILES}"
|
||||
PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
|
||||
fi
|
||||
RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
|
||||
RPM_SPEC="wx\$(TOOLKIT).spec"
|
||||
|
Reference in New Issue
Block a user