Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use 'cp -pR' as a fallback for lndir, remove $(shell) construct from makefile.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-10-10 16:29:02 +00:00
parent 21a186a1fc
commit bcaab0f92e
4 changed files with 98 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Makefile.in
View File

@@ -24381,7 +24381,7 @@ sound_sdl_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp
############################# Dirs ################################# ############################# Dirs #################################
WXDIR = $(shell echo $(top_srcdir) | grep '^/' || echo `pwd`/$(top_srcdir) ) WXDIR = @abs_top_srcdir@
# Subordinate library possibilities # Subordinate library possibilities
@@ -24436,6 +24436,11 @@ WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(WX_VERSION).tar.bz2
DISTDIRNAME=@DISTDIR@-$(WX_VERSION) DISTDIRNAME=@DISTDIR@-$(WX_VERSION)
DISTDIR=./_dist_dir/$(DISTDIRNAME) DISTDIR=./_dist_dir/$(DISTDIRNAME)
########################## Tools ###############################
# lndir can be used if available instead of copying
LNDIR = @LNDIR@
CP_PR = @CP_PR@
########################## make dist rules ############################### ########################## make dist rules ###############################
@@ -24485,8 +24490,8 @@ ALL_DIST: distrib_clean
ln -sf $(REGEXDIR)/*.c $(DISTDIR)/src/regex ln -sf $(REGEXDIR)/*.c $(DISTDIR)/src/regex
ln -sf $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex ln -sf $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
ln -sf $(REGEXDIR)/README $(DISTDIR)/src/regex ln -sf $(REGEXDIR)/README $(DISTDIR)/src/regex
mkdir $(DISTDIR)/src/expat test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/src/expat
lndir $(EXPATDIR) $(DISTDIR)/src/expat $(LNDIR) $(EXPATDIR) $(DISTDIR)/src/expat
#(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`) #(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
mkdir $(DISTDIR)/src/iodbc mkdir $(DISTDIR)/src/iodbc
ln -sf $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc ln -sf $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
@@ -24632,8 +24637,8 @@ GTK_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/include/wx/mac/corefoundation mkdir $(DISTDIR)/include/wx/mac/corefoundation
ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
mkdir $(DISTDIR)/contrib test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
lndir $(WXDIR)/contrib $(DISTDIR)/contrib $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib
X11_DIST: ALL_GUI_DIST UNIV_DIST X11_DIST: ALL_GUI_DIST UNIV_DIST
ln -sf $(WXDIR)/wxX11.spec $(DISTDIR) ln -sf $(WXDIR)/wxX11.spec $(DISTDIR)
@@ -24647,8 +24652,8 @@ X11_DIST: ALL_GUI_DIST UNIV_DIST
mkdir $(DISTDIR)/include/wx/mac mkdir $(DISTDIR)/include/wx/mac
mkdir $(DISTDIR)/include/wx/mac/corefoundation mkdir $(DISTDIR)/include/wx/mac/corefoundation
ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
mkdir $(DISTDIR)/contrib test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
lndir $(WXDIR)/contrib $(DISTDIR)/contrib $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib
MOTIF_DIST: ALL_GUI_DIST MOTIF_DIST: ALL_GUI_DIST
ln -sf $(WXDIR)/wxMotif.spec $(DISTDIR) ln -sf $(WXDIR)/wxMotif.spec $(DISTDIR)
@@ -24667,8 +24672,8 @@ MOTIF_DIST: ALL_GUI_DIST
ln -sf $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \ ln -sf $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
$(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \ $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
$(DISTDIR)/include/wx/x11 $(DISTDIR)/include/wx/x11
mkdir $(DISTDIR)/contrib test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
lndir $(WXDIR)/contrib $(DISTDIR)/contrib $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib
MACX_DIST: ALL_GUI_DIST MACX_DIST: ALL_GUI_DIST
ln -sf $(INCDIR)/*.* $(DISTDIR)/include ln -sf $(INCDIR)/*.* $(DISTDIR)/include
@@ -24700,8 +24705,8 @@ MACX_DIST: ALL_GUI_DIST
ln -sf $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex ln -sf $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex
ln -sf $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex ln -sf $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex
ln -sf $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex ln -sf $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex
mkdir $(DISTDIR)/contrib test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
lndir $(WXDIR)/contrib $(DISTDIR)/contrib $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib
# TODO: Distribute some files # TODO: Distribute some files
COCOA_DIST: ALL_GUI_DIST COCOA_DIST: ALL_GUI_DIST
@@ -24745,8 +24750,8 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
ln -sf $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince ln -sf $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
ln -sf $(SRCDIR)/*.??? $(DISTDIR)/src ln -sf $(SRCDIR)/*.??? $(DISTDIR)/src
ln -sf $(SRCDIR)/*.?? $(DISTDIR)/src ln -sf $(SRCDIR)/*.?? $(DISTDIR)/src
mkdir $(DISTDIR)/contrib test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
lndir $(WXDIR)/contrib $(DISTDIR)/contrib $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib
UNIV_DIST: ALL_GUI_DIST UNIV_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/include/wx/univ mkdir $(DISTDIR)/include/wx/univ
@@ -24766,8 +24771,8 @@ MGL_DIST: UNIV_DIST
ln -sf $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl ln -sf $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
mkdir $(DISTDIR)/src/msdos mkdir $(DISTDIR)/src/msdos
ln -sf $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos ln -sf $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
mkdir $(DISTDIR)/contrib test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
lndir $(WXDIR)/contrib $(DISTDIR)/contrib $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib
DEMOS_DIST: ALL_GUI_DIST DEMOS_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/demos mkdir $(DISTDIR)/demos
@@ -24781,8 +24786,8 @@ DEMOS_DIST: ALL_GUI_DIST
ln -sf $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs ln -sf $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
ln -sf $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs ln -sf $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
mkdir $(DISTDIR)/demos/dbbrowse test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/demos/dbbrowse
lndir $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse $(LNDIR) $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
mkdir $(DISTDIR)/demos/forty mkdir $(DISTDIR)/demos/forty
ln -sf $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty ln -sf $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty

39
build/bakefiles/make_dist.mk
View File

@@ -5,7 +5,7 @@
############################# Dirs ################################# ############################# Dirs #################################
WXDIR = $(shell echo $(top_srcdir) | grep '^/' || echo `pwd`/$(top_srcdir) ) WXDIR = @abs_top_srcdir@
# Subordinate library possibilities # Subordinate library possibilities
@@ -60,6 +60,11 @@ WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(WX_VERSION).tar.bz2
DISTDIRNAME=@DISTDIR@-$(WX_VERSION) DISTDIRNAME=@DISTDIR@-$(WX_VERSION)
DISTDIR=./_dist_dir/$(DISTDIRNAME) DISTDIR=./_dist_dir/$(DISTDIRNAME)
########################## Tools ###############################
# lndir can be used if available instead of copying
LNDIR = @LNDIR@
CP_PR = @CP_PR@
########################## make dist rules ############################### ########################## make dist rules ###############################
@@ -109,8 +114,8 @@ ALL_DIST: distrib_clean
ln -sf $(REGEXDIR)/*.c $(DISTDIR)/src/regex ln -sf $(REGEXDIR)/*.c $(DISTDIR)/src/regex
ln -sf $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex ln -sf $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
ln -sf $(REGEXDIR)/README $(DISTDIR)/src/regex ln -sf $(REGEXDIR)/README $(DISTDIR)/src/regex
mkdir $(DISTDIR)/src/expat test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/src/expat
lndir $(EXPATDIR) $(DISTDIR)/src/expat $(LNDIR) $(EXPATDIR) $(DISTDIR)/src/expat
#(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`) #(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
mkdir $(DISTDIR)/src/iodbc mkdir $(DISTDIR)/src/iodbc
ln -sf $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc ln -sf $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
@@ -256,8 +261,8 @@ GTK_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/include/wx/mac/corefoundation mkdir $(DISTDIR)/include/wx/mac/corefoundation
ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
mkdir $(DISTDIR)/contrib test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
lndir $(WXDIR)/contrib $(DISTDIR)/contrib $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib
X11_DIST: ALL_GUI_DIST UNIV_DIST X11_DIST: ALL_GUI_DIST UNIV_DIST
ln -sf $(WXDIR)/wxX11.spec $(DISTDIR) ln -sf $(WXDIR)/wxX11.spec $(DISTDIR)
@@ -271,8 +276,8 @@ X11_DIST: ALL_GUI_DIST UNIV_DIST
mkdir $(DISTDIR)/include/wx/mac mkdir $(DISTDIR)/include/wx/mac
mkdir $(DISTDIR)/include/wx/mac/corefoundation mkdir $(DISTDIR)/include/wx/mac/corefoundation
ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
mkdir $(DISTDIR)/contrib test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
lndir $(WXDIR)/contrib $(DISTDIR)/contrib $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib
MOTIF_DIST: ALL_GUI_DIST MOTIF_DIST: ALL_GUI_DIST
ln -sf $(WXDIR)/wxMotif.spec $(DISTDIR) ln -sf $(WXDIR)/wxMotif.spec $(DISTDIR)
@@ -291,8 +296,8 @@ MOTIF_DIST: ALL_GUI_DIST
ln -sf $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \ ln -sf $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
$(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \ $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
$(DISTDIR)/include/wx/x11 $(DISTDIR)/include/wx/x11
mkdir $(DISTDIR)/contrib test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
lndir $(WXDIR)/contrib $(DISTDIR)/contrib $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib
MACX_DIST: ALL_GUI_DIST MACX_DIST: ALL_GUI_DIST
ln -sf $(INCDIR)/*.* $(DISTDIR)/include ln -sf $(INCDIR)/*.* $(DISTDIR)/include
@@ -324,8 +329,8 @@ MACX_DIST: ALL_GUI_DIST
ln -sf $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex ln -sf $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex
ln -sf $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex ln -sf $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex
ln -sf $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex ln -sf $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex
mkdir $(DISTDIR)/contrib test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
lndir $(WXDIR)/contrib $(DISTDIR)/contrib $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib
# TODO: Distribute some files # TODO: Distribute some files
COCOA_DIST: ALL_GUI_DIST COCOA_DIST: ALL_GUI_DIST
@@ -369,8 +374,8 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
ln -sf $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince ln -sf $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
ln -sf $(SRCDIR)/*.??? $(DISTDIR)/src ln -sf $(SRCDIR)/*.??? $(DISTDIR)/src
ln -sf $(SRCDIR)/*.?? $(DISTDIR)/src ln -sf $(SRCDIR)/*.?? $(DISTDIR)/src
mkdir $(DISTDIR)/contrib test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
lndir $(WXDIR)/contrib $(DISTDIR)/contrib $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib
UNIV_DIST: ALL_GUI_DIST UNIV_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/include/wx/univ mkdir $(DISTDIR)/include/wx/univ
@@ -390,8 +395,8 @@ MGL_DIST: UNIV_DIST
ln -sf $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl ln -sf $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
mkdir $(DISTDIR)/src/msdos mkdir $(DISTDIR)/src/msdos
ln -sf $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos ln -sf $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
mkdir $(DISTDIR)/contrib test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
lndir $(WXDIR)/contrib $(DISTDIR)/contrib $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib
DEMOS_DIST: ALL_GUI_DIST DEMOS_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/demos mkdir $(DISTDIR)/demos
@@ -405,8 +410,8 @@ DEMOS_DIST: ALL_GUI_DIST
ln -sf $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs ln -sf $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
ln -sf $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs ln -sf $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
mkdir $(DISTDIR)/demos/dbbrowse test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/demos/dbbrowse
lndir $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse $(LNDIR) $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
mkdir $(DISTDIR)/demos/forty mkdir $(DISTDIR)/demos/forty
ln -sf $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty ln -sf $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty

49
configure vendored
View File

File diff suppressed because one or more lines are too long

6
configure.in
View File

@@ -1517,6 +1517,12 @@ fi dnl not GNU make
dnl needed for making link to setup.h dnl needed for making link to setup.h
AC_PROG_LN_S AC_PROG_LN_S
dnl lndir can be used by "make dist" to save copying files
CP_PR='cp -pR'
AC_CHECK_PROGS(LNDIR, lndir, [$CP_PR])
AC_SUBST(CP_PR)
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl Platform specific tests dnl Platform specific tests
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------