.SUFFIXES: .o .cpp .c .cxx
.c.o :
- $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
+ $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
.cpp.o :
- $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+ $(CC) -c @DEP_INFO_FLAGS@ $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
.cxx.o :
- $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+ $(CC) -c @DEP_INFO_FLAGS@ $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
########################### Paths #################################
srcdir = @srcdir@
+top_srcdir = @top_srcdir@
-VP1 = @top_srcdir@/src/common
-VP2 = @top_srcdir@/src/@TOOLKIT_DIR@
-VP3 = @top_srcdir@/src/motif/xmcombo
-VP4 = @top_srcdir@/src/generic
-VP5 = @top_srcdir@/src/unix
-VP6 = @top_srcdir@/src/html
-VP7 = @top_srcdir@/src/png
-VP8 = @top_srcdir@/src/jpeg
-VP9 = @top_srcdir@/src/tiff
-VP10 = @top_srcdir@/src/zlib
-VP11 = @top_srcdir@/src/iodbc
-VP12 = @top_srcdir@/src/msw/ole
-
-FTVP01 = @top_srcdir@/src/freetype/unix
-FTVP02 = @top_srcdir@/src/freetype/autohint
-FTVP03 = @top_srcdir@/src/freetype/base
-FTVP04 = @top_srcdir@/src/freetype/cff
-FTVP05 = @top_srcdir@/src/freetype/cid
-FTVP06 = @top_srcdir@/src/freetype/macfond
-FTVP07 = @top_srcdir@/src/freetype/otlayout
-FTVP08 = @top_srcdir@/src/freetype/psnames
-FTVP09 = @top_srcdir@/src/freetype/raster1
-FTVP10 = @top_srcdir@/src/freetype/sfnt
-FTVP11 = @top_srcdir@/src/freetype/smooth
-FTVP12 = @top_srcdir@/src/freetype/truetype
-FTVP13 = @top_srcdir@/src/freetype/type1
-FTVP14 = @top_srcdir@/src/freetype/type1z
-FTVP15 = @top_srcdir@/src/freetype/winfonts
-
-VP13 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
-VP14 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
+VP1 = @TOOLKIT_VPATH@
+VP2 = @top_srcdir@/src/common
+VP3 = @top_srcdir@/src/generic
+VP4 = @top_srcdir@/src/unix
+VP5 = @top_srcdir@/src/html
+VP6 = @top_srcdir@/src/png
+VP7 = @top_srcdir@/src/jpeg
+VP8 = @top_srcdir@/src/tiff
+VP9 = @top_srcdir@/src/zlib
+VPA = @top_srcdir@/src/regex
+VP10 = @top_srcdir@/src/iodbc
+VP11 = @top_srcdir@/src/msw/ole
+VP12 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
+VP13 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
# the comment at the end of the next line is needed because otherwise autoconf
# would remove this line completely - it contains a built-in hack to remove
# any VPATH assignment not containing ':'
-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13)@PATH_IFS@$(VP14) # ':' for autoconf
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf
-top_srcdir = @top_srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
# append a version suffix x.y.z to all file names
VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
-WXARCHIVE = @DISTDIR@-$(VER_SUFFIX).tar.gz
-WXGLARCHIVE = @DISTDIR@-gl-$(VER_SUFFIX).tar.gz
-WXSAMPLES = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
-WXDEMOS = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
+WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
+WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz
+WXSAMPLES=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
+WXDEMOS=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
-WXARCHIVE_BZIP = @DISTDIR@-$(VER_SUFFIX).tar.bz2
-WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
-WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
-WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
+WXARCHIVE_BZIP=@DISTDIR@-$(VER_SUFFIX).tar.bz2
+WXGLARCHIVE_BZIP=@DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
+WXSAMPLES_BZIP=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
+WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
-DISTDIR = ./_dist_dir/@DISTDIR@
+DISTDIRNAME=@DISTDIR@-$(VER_SUFFIX)
+DISTDIR=./_dist_dir/$(DISTDIRNAME)
############################## Files ##################################
# 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)
# the object files of sublibraries (we assume that they don't change [often],
# so we don't generate these lists with tmake but embed them here)
-ZLIBOBJS = \
+REGEXOBJS = \
+ regcomp.o \
+ regexec.o \
+ regerror.o \
+ regfree.o
+
+ZLIBOBJS = \
adler32.o \
compress.o \
crc32.o \
infutil.o \
inffast.o
-PNGOBJS = \
+PNGOBJS = \
png.o \
pngread.o \
pngrtran.o \
type1z.o \
winfnt.o
-JPEGOBJS = \
+JPEGOBJS = \
jcomapi.o \
jutils.o \
jerror.o \
jquant2.o \
jdmerge.o
-TIFFOBJS = \
+TIFFOBJS = \
tif_aux.o \
tif_close.o \
tif_codec.o \
@$(INSTALL) -d ./lib
$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
-@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o
+@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o @WX_LIBRARY_NAME_SHARED@
@$(INSTALL) -d ./lib
- $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
+ $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o ./lib/@WX_LIBRARY_NAME_SHARED@ $(EXTRALIBS) $(OPENGLLIBS)
./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r: ./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc
$(DEREZ) $^ $(DEREZFLAGS) > $@
-include $(DEPFILES)
afminstall: preinstall
- $(INSTALL) -d $(datadir)
+ @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
$(INSTALL) -d $(datadir)/wx
$(INSTALL) -d $(datadir)/wx/afm
$(INSTALL) -d $(datadir)/wx/gs_afm
@echo " Installing wxWindows..."
@echo " "
- $(INSTALL) -d $(prefix)
- $(INSTALL) -d $(bindir)
- $(INSTALL) -d $(libdir)
+ @if test ! -d $(prefix); then $(INSTALL) -d $(prefix); fi
+ @if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi
+ @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config
cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
done
- $(INSTALL) -d $(localedir)
+ @if test ! -d $(localedir); then $(INSTALL) -d $(localedir); fi
@for p in $(WX_LINGUAS); do \
- $(INSTALL) -d $(localedir)/$$p; \
- $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; \
+ if test ! -d $(localedir)/$$p; then $(INSTALL) -d $(localedir)/$$p; fi;\
+ if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; fi;\
$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
done
@echo " "
@echo " Installing wxWindows OpenGl add-on..."
@echo " "
- $(INSTALL) -d $(libdir)
+ @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
install: @AFMINSTALL@ @WX_ALL_INSTALLED@
mkdir $(DISTDIR)/src/tiff
mkdir $(DISTDIR)/src/iodbc
mkdir $(DISTDIR)/src/unix
- cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
+ cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)
cp $(SRCDIR)/*.in $(DISTDIR)/src
cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
cp $(COMMDIR)/*.c $(DISTDIR)/src/common
mkdir $(DISTDIR)/include/wx/unix
mkdir $(DISTDIR)/src/common
mkdir $(DISTDIR)/src/unix
- cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
+ cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)
cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR)
cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
+ mkdir $(DISTDIR)/samples/erase
+ cp $(SAMPDIR)/erase/Makefile.in $(DISTDIR)/samples/erase
+ cp $(SAMPDIR)/erase/makefile.unx $(DISTDIR)/samples/erase
+ cp $(SAMPDIR)/erase/*.cpp $(DISTDIR)/samples/erase
+
+ mkdir $(DISTDIR)/samples/event
+ cp $(SAMPDIR)/event/Makefile.in $(DISTDIR)/samples/event
+ cp $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event
+ cp $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event
+
mkdir $(DISTDIR)/samples/exec
cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec
mkdir $(DISTDIR)/samples/internat
mkdir $(DISTDIR)/samples/internat/de
mkdir $(DISTDIR)/samples/internat/fr
+ mkdir $(DISTDIR)/samples/internat/ru
cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr
cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
- #cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/de
+ cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru
cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
- #cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/de
+ cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru
mkdir $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
distclean:
$(RM) -r _dist_dir
+# VZ: the -only targets allow to do "make dist bzip-dist-only" without copying
+# the files twice
+dist-only:
+ @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+ @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
+ @if test "$(USE_GUI)" = 1; then \
+ cd $(DISTDIR); \
+ mv samples wxSamples-$(VER_SUFFIX); \
+ echo "*** Creating wxSamples archive..."; \
+ tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
+ mv wxSamples-$(VER_SUFFIX) samples; \
+ mv demos wxDemos-$(VER_SUFFIX); \
+ echo "*** Creating wxDemos archive..."; \
+ tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
+ mv wxDemos-$(VER_SUFFIX) demos; \
+ fi
+
dist: @GUIDIST@
- cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
+ cp $(WXDIR)/src/files.lst $(DISTDIR)/src
@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
- @cd _dist_dir; \
- mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
- tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
- mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
+ @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
@if test "$(USE_GUI)" = 1; then \
cd $(DISTDIR); \
mv samples wxSamples-$(VER_SUFFIX); \
+ echo "*** Creating wxSamples archive..."; \
tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
mv wxSamples-$(VER_SUFFIX) samples; \
mv demos wxDemos-$(VER_SUFFIX); \
+ echo "*** Creating wxDemos archive..."; \
tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
mv wxDemos-$(VER_SUFFIX) demos; \
fi
+bzip-dist-only:
+ @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+ @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP);
+ @if test "$(USE_GUI)" = 1; then \
+ cd $(DISTDIR); \
+ mv samples wxSamples-${VER_SUFFIX}; \
+ echo "*** Creating wxSamples archive..."; \
+ tar ch wxSamples-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
+ mv wxSamples-${VER_SUFFIX} samples; \
+ mv demos wxDemos-${VER_SUFFIX}; \
+ echo "*** Creating wxDemos archive..."; \
+ tar ch wxDemos-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
+ mv wxDemos-${VER_SUFFIX} demos; \
+ fi
+
bzip-dist: @GUIDIST@
cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
- cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) ..
+ @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP)
@if test "$(USE_GUI)" = 1; then \
cd $(DISTDIR); \
mv samples wxSamples; \
$(RM) *.d
$(RM) parser.c
$(RM) lexer.c
- $(RM) -r ./lib/wx/*
+ # $(RM) -r ./lib/wx/*
$(RM) ./lib/lib*
cleanall: clean