--- Makefile.fc9.orig 2008-08-31 17:53:10.000000000 +0200 +++ Makefile.fc9 2011-06-21 11:52:40.309974439 +0200 @@ -7,7 +7,7 @@ -prefix = /usr/local +prefix = ${PREFIX} exec_prefix = ${prefix} INSTALL = /usr/bin/install -c EXEEXT = @@ -18,18 +18,18 @@ top_srcdir = top_builddir = LDFLAGS_GUI = -CXX = g++ +CXX ?= g++ #CXXFLAGS = -g -O0 -pthread -Wall -Wundef -Wno-ctor-dtor-privacy -finput-charset=ISO-8859-1 -CXXFLAGS = -O2 -pthread -Wall -Wundef -Wno-ctor-dtor-privacy -finput-charset=ISO-8859-1 +CXXFLAGS += -pthread -Wall -Wundef -Wno-ctor-dtor-privacy #CPPFLAGS = -D__WXDEBUG__ -DGTK_NO_CHECK_CASTS -pthread -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DwxUSE_UNICODE=1 -I. -CPPFLAGS = -DGTK_NO_CHECK_CASTS -pthread -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DwxUSE_UNICODE=1 -I. -I/usr/include/wx-2.8 -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -LDFLAGS = -pthread -L/usr/X11R6/lib +CPPFLAGS += -DGTK_NO_CHECK_CASTS -pthread -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DwxUSE_UNICODE=1 -I. -I${LOCALBASE}/include/wx-2.8 -I${LOCALBASE}/lib/wx/include/gtk2-unicode-release-2.8 +LDFLAGS = -pthread -L${LOCALBASE}/lib WX_LIB_FLAVOUR = TOOLKIT = GTK TOOLKIT_LOWERCASE = gtk TOOLKIT_VERSION = 2 -EXTRALIBS = -pthread -L/usr/X11R6/lib -lz -ldl -lm -EXTRALIBS_GUI = -Wl,--export-dynamic -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0 -lXinerama -lXxf86vm -lpng -lz -ljpeg -ltiff +EXTRALIBS = -pthread -L${LOCALBASE}/lib -lz -lm +EXTRALIBS_GUI = -Wl,--export-dynamic -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lXinerama -lXxf86vm -lpng -lz -ljpeg -ltiff EXTRALIBS_SDL = HOST_SUFFIX = SAMPLES_RPATH_FLAG = -Wl,-rpath,$(top_builddir)lib @@ -38,7 +38,7 @@ ### Variables: ### DESTDIR = -OBJDIR = objs/ +OBJDIR = WX_RELEASE = 2.8 WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(top_builddir)lib