Small makefile corrections.

  Added test for endianness.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index 2abbf4a4cf4a82c5d5046ee88da61e6cf9ad20dd..f5a215647a7b70590d3e7f6b939bbe7c7716e6cd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1051,6 +1051,9 @@ AC_CHECK_SIZEOF(int, 4)
 AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(long long, 0)
 
 AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(long long, 0)
 

+dnl for bytesex stuff
+AC_C_BIGENDIAN
+

 dnl check for iostream (as opposed to iostream.h) standard header
 WX_CPP_NEW_HEADERS(, AC_DEFINE(wxUSE_IOSTREAMH))
 
 dnl check for iostream (as opposed to iostream.h) standard header
 WX_CPP_NEW_HEADERS(, AC_DEFINE(wxUSE_IOSTREAMH))
 


@@ -1160,7 +1163,7 @@ if test "$wxUSE_THREADS" = "yes"; then
   CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
   CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"

-  LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ"
+dnl  LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ"

 
   dnl define autoconf macro to check for given function in both pthread and
   dnl posix4 libraries
 
   dnl define autoconf macro to check for given function in both pthread and
   dnl posix4 libraries


@@ -1581,9 +1584,6 @@ if test "$wxUSE_RESOURCES" = "yes" ; then
   if test "$wxUSE_PROLOGIO" = "yes" ; then
     AC_DEFINE(wxUSE_RESOURCES)
     LTLIBOBJS="$LTLIBOBJS resource.lo"
   if test "$wxUSE_PROLOGIO" = "yes" ; then
     AC_DEFINE(wxUSE_RESOURCES)
     LTLIBOBJS="$LTLIBOBJS resource.lo"

-    if test "$wxUSE_GTK" = 1; then
-      LTLIBOBJS="$LTLIBOBJS utilsres.lo"
-    fi

     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
   else
     AC_MSG_WARN([wxWindows ressource system requires PrologIO and can't be compiled without it.])
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
   else
     AC_MSG_WARN([wxWindows ressource system requires PrologIO and can't be compiled without it.])

diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index e9fc7542c5939dbb600b45e3e732ac20911435e6..389a549fa00f5d7f26c4c14b37a3126b2b9d8647 100644 (file)
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -156,7 +156,6 @@ libwx_gtk2_la_SOURCES = \
  gauge.cpp \
  gdiobj.cpp \
  icon.cpp \
  gauge.cpp \
  gdiobj.cpp \
  icon.cpp \

- joystick.cpp \

  listbox.cpp \
  main.cpp \
  mdi.cpp \
  listbox.cpp \
  main.cpp \
  mdi.cpp \


@@ -178,8 +177,6 @@ libwx_gtk2_la_SOURCES = \
  stattext.cpp \
  tbargtk.cpp \
  textctrl.cpp \
  stattext.cpp \
  tbargtk.cpp \
  textctrl.cpp \

- threadno.cpp \
- threadsgi.cpp \

  timer.cpp \
  tooltip.cpp \
  treectrl.cpp \
  timer.cpp \
  tooltip.cpp \
  treectrl.cpp \

diff --git a/src/gtk1/Makefile.am b/src/gtk1/Makefile.am
index e9fc7542c5939dbb600b45e3e732ac20911435e6..389a549fa00f5d7f26c4c14b37a3126b2b9d8647 100644 (file)
--- a/src/gtk1/Makefile.am
+++ b/src/gtk1/Makefile.am
@@ -156,7 +156,6 @@ libwx_gtk2_la_SOURCES = \
  gauge.cpp \
  gdiobj.cpp \
  icon.cpp \
  gauge.cpp \
  gdiobj.cpp \
  icon.cpp \

- joystick.cpp \

  listbox.cpp \
  main.cpp \
  mdi.cpp \
  listbox.cpp \
  main.cpp \
  mdi.cpp \


@@ -178,8 +177,6 @@ libwx_gtk2_la_SOURCES = \
  stattext.cpp \
  tbargtk.cpp \
  textctrl.cpp \
  stattext.cpp \
  tbargtk.cpp \
  textctrl.cpp \

- threadno.cpp \
- threadsgi.cpp \

  timer.cpp \
  tooltip.cpp \
  treectrl.cpp \
  timer.cpp \
  tooltip.cpp \
  treectrl.cpp \