More makefiles correction. Minimal runs now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-06-04 06:50:42 +00:00
parent c6eba8f8b2
commit 47b61a784c
3 changed files with 3 additions and 10 deletions

View File

@@ -1583,7 +1583,6 @@ fi
if test "$wxUSE_RESOURCES" = "yes" ; then
if test "$wxUSE_PROLOGIO" = "yes" ; then
AC_DEFINE(wxUSE_RESOURCES)
LTLIBOBJS="$LTLIBOBJS resource.lo"
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
else
AC_MSG_WARN([wxWindows ressource system requires PrologIO and can't be compiled without it.])
@@ -1811,7 +1810,7 @@ EXTRA_LIBS="$LIBS $POSIX4_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $GUILIBS"
dnl all the libraries needed to link wxWindows programs (when the library is not
dnl yet installed)
LIBS="\${top_builddir}/src/${WX_LIBRARY_NAME} $EXTRA_LIBS"
LIBS="\${top_builddir}/src/${TOOLKIT_DIR}/${WX_LIBRARY_NAME} $EXTRA_LIBS"
dnl all -I options we must pass to the compiler
INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $TOOLKIT_INCLUDE $ZLIB_INCLUDE $LIBPNG_INCLUDE"

View File

@@ -21,7 +21,7 @@ libwx_gtk2_la_SOURCES = \
\
win_gtk.c \
extended.c \
utilsgtk.cpp \
parser.c \
\
cmndata.cpp \
dynarray.cpp \
@@ -73,7 +73,6 @@ libwx_gtk2_la_SOURCES = \
prntbase.cpp \
process.cpp \
protocol.cpp \
resourc2.cpp \
resource.cpp \
sckaddr.cpp \
sckfile.cpp \
@@ -109,7 +108,6 @@ libwx_gtk2_la_SOURCES = \
laywin.cpp \
listctrl.cpp \
msgdlgg.cpp \
notebook.cpp \
panelg.cpp \
printps.cpp \
prntdlgg.cpp \
@@ -179,7 +177,6 @@ libwx_gtk2_la_SOURCES = \
textctrl.cpp \
timer.cpp \
tooltip.cpp \
treectrl.cpp \
utilsgtk.cpp \
utilsres.cpp \
wave.cpp \

View File

@@ -21,7 +21,7 @@ libwx_gtk2_la_SOURCES = \
\
win_gtk.c \
extended.c \
utilsgtk.cpp \
parser.c \
\
cmndata.cpp \
dynarray.cpp \
@@ -73,7 +73,6 @@ libwx_gtk2_la_SOURCES = \
prntbase.cpp \
process.cpp \
protocol.cpp \
resourc2.cpp \
resource.cpp \
sckaddr.cpp \
sckfile.cpp \
@@ -109,7 +108,6 @@ libwx_gtk2_la_SOURCES = \
laywin.cpp \
listctrl.cpp \
msgdlgg.cpp \
notebook.cpp \
panelg.cpp \
printps.cpp \
prntdlgg.cpp \
@@ -179,7 +177,6 @@ libwx_gtk2_la_SOURCES = \
textctrl.cpp \
timer.cpp \
tooltip.cpp \
treectrl.cpp \
utilsgtk.cpp \
utilsres.cpp \
wave.cpp \