Added UNIV_DIST target.

Fixed hp-hpux lib build targets.
Enabled cygwin cross compilation for 2.3 too.
Fixed SONAME_FLAGS for solaris.
Fixed PIC_FLAG for mingw.
Added first draft of wxUNIV debs.
Removed obsolete src/makeenvs/*


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

Makefile.in

@@ -691,6 +691,15 @@ MSW_DIST: ALL_GUI_DIST
 	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 
+UNIV_DIST: ALL_GUI_DIST
+	mkdir $(DISTDIR)/include/wx/univ
+	mkdir $(DISTDIR)/src/univ
+	mkdir $(DISTDIR)/src/univ/themes
+	cp $(INCDIR)/wx/univ/*.h $(DISTDIR)/include/wx/univ
+	cp $(SRCDIR)/univ/files.lst $(DISTDIR)/src/univ
+	cp $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ
+	cp $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes
+
 DEMOS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/demos
 	cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
@@ -1363,7 +1372,7 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 
-debian-native-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST
+debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
 
 debian-msw-dirs:
 	mkdir $(DISTDIR)/include/wx/msw

configure.in

@@ -549,6 +549,7 @@ case "${host}" in
     AC_DEFINE(STRICT)
     AC_DEFINE(WINVER, 0x0400)
     PROGRAM_EXT=".exe"
+    RESCOMP=windres
     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;
 
@@ -1659,6 +1660,11 @@ if test "$USE_WIN32" = 1 ; then
     dnl ---        some of them should probably be included conditionally.
     LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
 
+    dnl Cygwin doesn't link these by default
+    if test "$wxUSE_CYGWIN" = 1; then
+        LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
+    fi
+
     dnl add extra odbc libs if we have compiled in odbc
     if test "$wxUSE_ODBC" = "yes" ; then
         LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
@@ -2164,6 +2170,13 @@ if test "$wxUSE_SHARED" = "yes"; then
             PIC_FLAG="+Z"
         fi
 
+        dnl install shared libs without symlinks
+        if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="preinstall_gl"
+            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
+        else
+            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
+        fi
       ;;
 
       *-*-linux* )
@@ -2201,6 +2214,8 @@ if test "$wxUSE_SHARED" = "yes"; then
         else
             SHARED_LD="${CXX} -G -o"
             PIC_FLAG="-KPIC"
+            SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
+            SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED}"
         fi
       ;;
 
@@ -2215,30 +2230,26 @@ if test "$wxUSE_SHARED" = "yes"; then
         SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
       ;;
 
-      *-*-cygwin* )
+      *-*-cygwin* | *-*-mingw32* )
-        dnl only static for now
-        AC_MSG_WARN(Shared libs unsupported for $host_alias -- forcing static build.)
-        wxUSE_SHARED=no
-      ;;
-
-      *-*-mingw32* )
         SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_NAME_STATIC} -o"
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"
         WXMSW_DLL_DEFINES="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
-        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
+
-        WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}"
+        dnl install shared libs without symlinks
         if test "$wxUSE_OPENGL" = "yes"; then
             WX_ALL_INSTALLED="preinstall_gl"
             WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
         else
             WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
         fi
+        dnl -fPIC is not required for mingw build -- all code is already
+        dnl position independent
+        PIC_FLAG=
       ;;
 
       *-pc-os2_emx )
         dnl only static for now
-        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+        wxUSE_SHARED=no
-        WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}"
       ;;
 
       *-*-beos* )
@@ -2257,7 +2268,7 @@ if test "$wxUSE_SHARED" = "yes"; then
       ;;
 
       *)
-        AC_MSG_ERROR(unknown system type ${host}.)
+        AC_MSG_ERROR(unknown system type $host.)
     esac
 
     dnl set target to shared if not explicitly chose static before

debian/control.in

@@ -140,6 +140,19 @@ Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs)
  This package provides the contrib libs of the wxWindows source tree
  (mmedia, ogl, stc)
 
+Package: libwxgtk=V-univ
+Architecture: any
+Section: libs
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libgtk1.2-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libc6-dev, ${shlibs:Depends}
+Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
+Description: wxWindows Cross-platform C++ GUI toolkit (wxUNIVERSAL widgets)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This package is built to use the wxUNIVERSAL widget set instead of
+ native gtk widgets.
+
 Package: libwxgtk=V-contrib-dev
 Architecture: any
 Section: devel

debian/rules

@@ -31,6 +31,8 @@ package_i18n=wxwin$(release)-i18n
 package_doc=wxwin$(release)-doc
 package_examples=wxwin$(release)-examples
 
+package_gtk_univ=libwxgtk$(release)-univ
+
 package_wxbase_msw_dev=libwxbase-msw$(release)-dev
 package_msw_dev=libwxmsw$(release)-dev
 package_headers_msw=wxwin$(release)-headers-msw
@@ -47,11 +49,13 @@ objdir_doc=docs/wxWindows-manual.html
 objdir_examples=docs/examples
 objdir_i18n=locale
 
+objdir_gtk_univ=objs_gtk_univ
+
 objdir_wxbase_msw_static=objs_wxbase_msw_st
 objdir_msw_static=objs_msw_st
 
 objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
-	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \
+	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) $(objdir_gtk_univ) \
 	$(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \
         $(objdir_wxbase_msw_static) $(objdir_msw_static)
 
@@ -63,6 +67,7 @@ objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
 build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
                   build-wxbase-debug-stamp build-gtk-shared-stamp \
                   build-gtk-static-stamp build-gtk-debug-stamp \
+                  build-gtk-univ-stamp \
                   build-contrib-shared-stamp build-contrib-static-stamp \
                   build-gtk-py-stamp build-i18n-stamp
 
@@ -77,6 +82,7 @@ build_stamps=$(build_stamps_native) $(build_cross_stamps)
 # Install targets:
 install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
                  install-gtk-lib install-gtk-dev install-gtk-dbg \
+                 install-gtk-univ \
                  install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
                  install-headers install-i18n
 
@@ -129,6 +135,11 @@ control-files-stamp: debian/control
 		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \
 			> debian/$(package_gtk_dbg).$$f; \
 	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_gtk_univ).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-univ.$$f \
+			> debian/$(package_gtk_univ).$$f; \
+	done;
 	@for f in dirs docs files postinst prerm; do \
 		echo "generating control file $(package_gtk_py).$$f"; \
 		sed -e 's/=PY/$(python_dir)/g;s/=V/$(release)/g' < debian/libwxgtk-python.$$f \
@@ -274,6 +285,23 @@ build-gtk-debug-stamp:
 		&& $(MAKE)
 	touch $@
 
+build-gtk-univ-stamp:
+	dh_testdir
+	mkdir -p $(objdir_gtk_univ)
+	cd $(objdir_gtk_univ) \
+		&& ../configure --prefix=/usr \
+				--cache-file=../config_deb.cache \
+				--with-gtk \
+				--with-opengl \
+				--enable-universal \
+				--enable-soname \
+				--with-zlib=sys \
+				--with-libjpeg=sys \
+				--with-libpng=sys \
+				--with-libtiff=sys \
+		&& $(MAKE)
+	touch $@
+
 build-contrib-shared-stamp: build-gtk-shared-stamp
 	dh_testdir
 	cd $(objdir_gtk_shared)/contrib/src \
@@ -379,6 +407,7 @@ clean: debian/control
 	rm -f debian/$(package_gtk_lib).*
 	rm -f debian/$(package_gtk_dev).*
 	rm -f debian/$(package_gtk_dbg).*
+	rm -f debian/$(package_gtk_univ).*
 	rm -f debian/$(package_gtk_py).*
 	rm -f debian/$(package_gtk_contrib).*
 	rm -f debian/$(package_gtk_contrib_dev).*
@@ -451,6 +480,15 @@ install-gtk-dbg: build-gtk-debug-stamp
 	cp $(objdir_gtk_debug)/wxgtkd-$(release)-config debian/$(package_gtk_dbg)/usr/bin/
 	cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
 
+install-gtk-univ: DH_OPTIONS=-p$(package_gtk_univ)
+install-gtk-univ: build-gtk-univ-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_gtk_univ)/lib/* debian/$(package_gtk_univ)/usr/lib
+	cp $(objdir_gtk_univ)/wxgtkuniv-$(release)-config debian/$(package_gtk_univ)/usr/bin/
+
 install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
 install-gtk-contrib: build-contrib-shared-stamp
 	dh_testdir
@@ -638,6 +676,9 @@ binary-wxbase-dev: control-files-stamp install-wxbase-dev install-headers
 binary-wxbase-dbg: control-files-stamp install-wxbase-dbg install-headers
 	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_wxbase_dbg) -p$(package_headers)" binary-common
 
+binary-univ: control-files-stamp install-gtk-univ
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_univ)" binary-common
+
 # docs package
 binary-doc: control-files-stamp install-doc
 	$(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common

src/makeenvs/linux.env

@@ -1,122 +0,0 @@
-# generic.env
-# Linux/generic
-#
-# Common makefile settings for wxWindows programs
-# This file is included by all the other makefiles, thus changes 
-# made here take effect everywhere (except where overriden).
-# RCS-ID:      $Id$
-#
-########################### Programs #################################
-
-# Replace this with your own path if necessary
-WXDIR       = $(WXWIN)
-
-# C++ compiler
-CC          = g++
-
-# C compiler
-CCC         = gcc
-
-# Compiler for lex/yacc .c programs
-CCLEX       = $(CCC)
-
-LEX         = lex
-YACC        = yacc
-# Note: if using bison, use -y option for yacc compatibility
-# YACC      = bison -y
-MAKE        = make
-AROPTIONS   = ruv
-RANLIB      = ranlib
-
-############################ Switches #################################
-
-# Debug/trace mode. 1 or more for debugging.
-DEBUG       = 1
-GUI         = -D__WXSTUBS__ -D__UNIX__
-GUISUFFIX   = _stubs
-
-########################## Compiler flags #############################
-
-# Misc options
-OPTIONS     = -D__LINUX__ -D__WXDEBUG__
-COPTIONS    =
-DEBUGFLAGS  = -ggdb
-INCLUDE     =
-WARN        = -Wall -Wno-unused # -w
-CWARN       = -Wall -Wno-unused # -w
-OPT         = # -O2
-
-############################ Includes #################################
-
-# Compiler or system-specific include paths
-COMPPATHS   =
-XINCLUDE    = -I/usr/openwin/include -I/usr/include/X11 -I/usr/include/Xm \
-              -I/usr/include/X11/Xm -I/usr/include
-XLIB        = -L/usr/local/X11/lib -L/usr/openwin/lib -L/usr/X11/lib -L/usr/X11R6/lib
-
-############################ Libraries ################################
-
-COMPLIBS    = -lstdc++
-GUILDLIBS   = -lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lXpm -lX11 -lm
-
-############################# Suffixes ################################
-
-# Change cpp to c if you want to use main.c instead of main.cpp.
-# Edit wx_setup.h accordingly (USE_C_MAIN=1)
-
-OBJSUFF     =o
-SRCSUFF     =cpp
-MAINSUFF    =cpp
-
-####################### No changes below this line ####################
-
-WXINC       = $(WXDIR)/include
-WXLIB       = $(WXDIR)/lib/libwx$(GUISUFFIX).a
-INC         = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(COMPPATHS)
-
-# Directory for object files
-OBJDIR = objects$(GUISUFFIX)
-
-CPPFLAGS    = $(EXTRACPPFLAGS) $(INC) $(XINCLUDE) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
-CFLAGS      = $(EXTRACFLAGS) $(INC) $(XINCLUDE) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)
-LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
-LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
-
-# Clears all default suffixes
-.SUFFIXES:	.o .cpp .c
-
-.c.o :
-	$(CCC) -c $(CFLAGS) -o $@ $<
-
-.cpp.o :
-	$(CC) -c $(CPPFLAGS) -o $@ $<
-
-.C.o :
-	$(CC) -c $(CPPFLAGS) -o $@ $<
-
-####################### Targets to allow multiple GUIs ####################
-
-dummy:
-	echo Use a target: one of motif, stubs
-
-stubs:
-	make -f makefile.unx all GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
-
-motif:
-	make -f makefile.unx all GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lpng -lzlib -lXm -lXmu -lXt -lXpm -lX11 -lm'
-
-gtk:
-	make -f makefile.unx all GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk2 $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lpng -lzlib -lX11 -lm -pthread'
-
-cleanstubs:
-	make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
-
-cleanmotif:
-	make -f makefile.unx clean GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
-
-cleangtk:
-	make -f makefile.unx clean GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk'
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-

src/makeenvs/sgi.env

@@ -1,119 +0,0 @@
-# sgi.env
-# SGI
-#
-# Common makefile settings for wxWindows programs
-# This file is included by all the other makefiles, thus changes 
-# made here take effect everywhere (except where overriden).
-# RCS-ID:      $Id$
-#
-########################### Programs #################################
-
-# Replace this with your own path if necessary
-WXWIN	    = /home/jds/wx2
-WXDIR       = $(WXWIN)
-
-# C++ compiler
-CC          = CC
-
-# C compiler
-CCC         = cc
-
-# Compiler for lex/yacc .c programs
-CCLEX       = $(CCC)
-
-LEX         = lex
-YACC        = yacc
-# Note: if using bison, use -y option for yacc compatibility
-# YACC      = bison -y
-MAKE        = make
-AROPTIONS   = ruv
-RANLIB      = echo
-
-############################ Switches #################################
-
-# Debug/trace mode. 1 or more for debugging.
-DEBUG       = 0
-GUI         = -D__WXSTUBS__ -D__UNIX__
-GUISUFFIX   = _stubs
-
-########################## Compiler flags #############################
-
-# Misc options
-OPTIONS     = -32 -D__WXDEBUG__ -D__SGI__ -D__SGI_CC__ 
-COPTIONS    = -32 -Xcpluscomm -D__SGI__ -D__SGI_CC__ 
-DEBUGFLAGS  = -g3
-INCLUDE     =
-WARN        = -w
-CWARN       = -w
-OPT         = 
-
-############################ Includes #################################
-
-# Compiler or system-specific include paths
-COMPPATHS   = 
-XINCLUDE    = -I/usr/include/X11 -I/usr/include/Xm \
-              -I/usr/include/X11/Xm -I/usr/include
-XLIB        = -L/usr/local/X11/lib -L/usr/X11/lib -L/usr/X11R6/lib
-
-############################ Libraries ################################
-
-COMPLIBS    = 
-#COMPLIBS    = -lstdc++
-#COMPLIBS    = -lPW
-GUILDLIBS   = -lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lXpm -lX11 -lm
-
-############################# Suffixes ################################
-
-OBJSUFF     =o
-SRCSUFF     =cpp
-MAINSUFF    =cpp
-
-####################### No changes below this line ####################
-
-WXINC       = $(WXDIR)/include
-WXLIB       = $(WXDIR)/lib/libwx$(GUISUFFIX).a
-INC         = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(COMPPATHS)
-
-# Directory for object files
-OBJDIR = objects$(GUISUFFIX)
-
-CPPFLAGS    = $(EXTRACPPFLAGS) $(INC) $(XINCLUDE) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
-CFLAGS      = $(EXTRACFLAGS) $(INC) $(XINCLUDE) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)
-LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
-LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
-
-# Clears all default suffixes
-.SUFFIXES:	.o .cpp .c
-
-.c.o :
-	$(CCC) -c $(CFLAGS) -o $@ $<
-
-.cpp.o :
-	$(CC) -c $(CPPFLAGS) -o $@ $<
-
-.C.o :
-	$(CC) -c $(CPPFLAGS) -o $@ $<
-
-####################### Targets to allow multiple GUIs ####################
-
-dummy:
-	echo Use a target: one of motif, stubs
-
-stubs:
-	make -f makefile.unx all GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
-
-motif:
-	make -f makefile.unx all GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lpng -lzlib -lXm -lXmu -lXt -lXpm -lX11 -lm'
-
-gtk:
-	make -f makefile.unx all GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk2 $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lpng -lzlib -lX11 -lm -pthread'
-
-cleanstubs:
-	make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
-
-cleanmotif:
-	make -f makefile.unx clean GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-

src/makeenvs/solaris.env

@@ -1,122 +0,0 @@
-# solaris.env
-# Solaris
-#
-# Common makefile settings for wxWindows programs
-# This file is included by all the other makefiles, thus changes 
-# made here take effect everywhere (except where overriden).
-# RCS-ID:      $Id$
-#
-########################### Programs #################################
-
-# Replace this with your own path if necessary
-WXDIR       = $(WXWIN)
-
-# C++ compiler
-CC          = CC
-
-# C compiler
-CCC         = cc
-
-# Compiler for lex/yacc .c programs
-CCLEX       = $(CCC)
-
-LEX         = lex
-YACC        = yacc
-# Note: if using bison, use -y option for yacc compatibility
-# YACC      = bison -y
-MAKE        = make
-AROPTIONS   = ruv
-RANLIB      = ranlib
-
-############################ Switches #################################
-
-# Debug/trace mode. 1 or more for debugging.
-DEBUG       = 0
-GUI         = -D__MOTIF__ -D__SOLARIS__ -D__UNIX__
-GUISUFFIX   = _motif
-
-########################## Compiler flags #############################
-
-# Misc options
-OPTIONS     = -DSYSV -DSVR4 -fast
-COPTIONS    = -DSYSV -xCC
-DEBUGFLAGS  = 
-INCLUDE     =
-WARN        =
-CWARN       = 
-OPT         = -O4 -lintl
-
-############################ Includes #################################
-
-# Compiler or system-specific include paths
-COMPPATHS   =
-XINCLUDE    = -I/usr/openwin/include -I/usr/include/X11 -I/usr/include/Xm \
-              -I/usr/include/X11/Xm -I/usr/include
-XLIB        = -L/usr/local/X11/lib -L/usr/openwin/lib -L/usr/X11/lib -L/usr/X11R6/lib
-
-############################ Libraries ################################
-
-COMPLIBS    =  -lgen -ldl -lsocket -lnsl
-GUILDLIBS   = -lwx_motif $(COMPLIBS) -lpng -lzlib -lXpm -lXm -lXmu -lXt -lX11 -lm
-
-############################# Suffixes ################################
-
-# Change cpp to c if you want to use main.c instead of main.cpp.
-# Edit wx_setup.h accordingly (USE_C_MAIN=1)
-
-OBJSUFF     =o
-SRCSUFF     =cpp
-MAINSUFF    =cpp
-
-####################### No changes below this line ####################
-
-WXINC       = $(WXDIR)/include
-WXLIB       = $(WXDIR)/lib/libwx$(GUISUFFIX).a
-INC         = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(COMPPATHS)
-
-# Directory for object files
-OBJDIR = objects$(GUISUFFIX)
-
-CPPFLAGS    = $(EXTRACPPFLAGS) $(INC) $(XINCLUDE) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
-CFLAGS      = $(EXTRACFLAGS) $(INC) $(XINCLUDE) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)
-LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
-LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
-
-# Clears all default suffixes
-.SUFFIXES:	.o .cpp .c
-
-.c.o :
-	$(CCC) -c $(CFLAGS) -o $@ $<
-
-.cpp.o :
-	$(CC) -c $(CPPFLAGS) -o $@ $<
-
-.C.o :
-	$(CC) -c $(CPPFLAGS) -o $@ $<
-
-####################### Targets to allow multiple GUIs ####################
-
-dummy:
-	echo Use a target: one of motif, stubs
-
-stubs:
-	make -f makefile.unx all GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
-
-motif:
-	make -f makefile.unx all GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lpng -lzlib -lXm -lXmu -lXt -lXpm -lX11 -lm'
-
-gtk:
-	make -f makefile.unx all GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk2 $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lpng -lzlib -lX11 -lm -pthread'
-
-cleanstubs:
-	make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
-
-cleanmotif:
-	make -f makefile.unx clean GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
-
-cleangtk:
-	make -f makefile.unx clean GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk'
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-