Regenerated makefiles after copying of subdirectory.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
parent
98221326bc
commit
fb785edf4c
@ -110,7 +110,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: help$(EXEEXT) $(__help_bundle___depname) data
|
||||
all: help$(EXEEXT) $(__help_bundle___depname) data data_doc
|
||||
|
||||
install: all
|
||||
|
||||
@ -158,15 +158,19 @@ help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1@help_bundle: $(____help_BUNDLE_TGT_REF_DEP)
|
||||
|
||||
data:
|
||||
@mkdir -p .
|
||||
@for f in back.gif books.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif; do \
|
||||
if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f \) ; then \
|
||||
cp -pRf $(srcdir)/$$f . ; \
|
||||
fi; \
|
||||
done
|
||||
|
||||
data_doc:
|
||||
@mkdir -p ./doc
|
||||
@for f in aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm; do \
|
||||
if test ! -e ./doc/$$f ; \
|
||||
then x=yep ; \
|
||||
else x=`find $(srcdir)/doc/$$f -newer ./doc/$$f -print` ; \
|
||||
if test \( ! -s ./doc/$$f \) -o \( $(srcdir)/doc/$$f -nt ./doc/$$f \) ; then \
|
||||
cp -pRf $(srcdir)/doc/$$f ./doc ; \
|
||||
fi; \
|
||||
case "$$x" in ?*) \
|
||||
cp -pRf $(srcdir)/doc/$$f ./doc ;; \
|
||||
esac; \
|
||||
done
|
||||
|
||||
help_demo.o: $(srcdir)/demo.cpp
|
||||
@ -179,4 +183,4 @@ help_demo_rc.o: $(srcdir)/demo.rc
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all install uninstall clean distclean help_bundle data
|
||||
.PHONY: all install uninstall clean distclean help_bundle data data_doc
|
||||
|
||||
@ -156,7 +156,7 @@ $(OBJS):
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: $(OBJS)\help.exe data
|
||||
all: $(OBJS)\help.exe data data_doc
|
||||
|
||||
clean:
|
||||
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
||||
@ -174,6 +174,10 @@ $(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res
|
||||
|
|
||||
|
||||
data:
|
||||
if not exist $(OBJS) mkdir $(OBJS)
|
||||
for %f in (back.gif books.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
|
||||
|
||||
data_doc:
|
||||
if not exist $(OBJS)\doc mkdir $(OBJS)\doc
|
||||
for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
|
||||
|
||||
@ -182,4 +186,3 @@ $(OBJS)\help_demo.obj: .\demo.cpp
|
||||
|
||||
$(OBJS)\help_demo.res: .\demo.rc
|
||||
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
|
||||
|
||||
|
||||
@ -161,7 +161,7 @@ $(OBJS):
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: $(OBJS)\help.exe data
|
||||
all: $(OBJS)\help.exe data data_doc
|
||||
|
||||
clean:
|
||||
-if exist $(OBJS)\*.o del $(OBJS)\*.o
|
||||
@ -171,6 +171,10 @@ $(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo_rc.o
|
||||
$(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
|
||||
|
||||
data:
|
||||
if not exist $(OBJS) mkdir $(OBJS)
|
||||
for %%f in (back.gif books.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
|
||||
|
||||
data_doc:
|
||||
if not exist $(OBJS)\doc mkdir $(OBJS)\doc
|
||||
for %%f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%%f copy .\doc\%%f $(OBJS)\doc
|
||||
|
||||
@ -180,5 +184,4 @@ $(OBJS)\help_demo.o: ./demo.cpp
|
||||
$(OBJS)\help_demo_rc.o: ./demo.rc
|
||||
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
|
||||
|
||||
.PHONY: all clean data
|
||||
|
||||
.PHONY: all clean data data_doc
|
||||
|
||||
@ -243,7 +243,7 @@ $(OBJS):
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: $(OBJS)\help.exe data
|
||||
all: $(OBJS)\help.exe data data_doc
|
||||
|
||||
clean:
|
||||
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
||||
@ -258,6 +258,10 @@ $(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res
|
||||
<<
|
||||
|
||||
data:
|
||||
if not exist $(OBJS) mkdir $(OBJS)
|
||||
for %f in (back.gif books.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
|
||||
|
||||
data_doc:
|
||||
if not exist $(OBJS)\doc mkdir $(OBJS)\doc
|
||||
for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
|
||||
|
||||
@ -266,4 +270,3 @@ $(OBJS)\help_demo.obj: .\demo.cpp
|
||||
|
||||
$(OBJS)\help_demo.res: .\demo.rc
|
||||
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**
|
||||
|
||||
|
||||
@ -103,13 +103,6 @@ __RUNTIME_LIBS_5 = -br
|
||||
!ifeq RUNTIME_LIBS static
|
||||
__RUNTIME_LIBS_5 =
|
||||
!endif
|
||||
__EXCEPTIONSFLAG_6 =
|
||||
!ifeq USE_EXCEPTIONS 0
|
||||
__EXCEPTIONSFLAG_6 =
|
||||
!endif
|
||||
!ifeq USE_EXCEPTIONS 1
|
||||
__EXCEPTIONSFLAG_6 = -xr
|
||||
!endif
|
||||
__EXCEPTIONSFLAG_7 =
|
||||
!ifeq USE_EXCEPTIONS 0
|
||||
__EXCEPTIONSFLAG_7 =
|
||||
@ -186,7 +179,7 @@ SETUPHDIR = &
|
||||
HELP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) &
|
||||
-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
|
||||
-i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples &
|
||||
$(__EXCEPTIONSFLAG_6) $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
|
||||
$(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
|
||||
HELP_OBJECTS = &
|
||||
$(OBJS)\help_demo.obj
|
||||
|
||||
@ -197,7 +190,7 @@ $(OBJS) :
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all : .SYMBOLIC $(OBJS)\help.exe data
|
||||
all : .SYMBOLIC $(OBJS)\help.exe data data_doc
|
||||
|
||||
clean : .SYMBOLIC
|
||||
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
||||
@ -218,6 +211,10 @@ $(OBJS)\help.exe : $(HELP_OBJECTS) $(OBJS)\help_demo.res
|
||||
wlink @$(OBJS)\help.lbc
|
||||
|
||||
data : .SYMBOLIC
|
||||
if not exist $(OBJS) mkdir $(OBJS)
|
||||
for %f in (back.gif books.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
|
||||
|
||||
data_doc : .SYMBOLIC
|
||||
if not exist $(OBJS)\doc mkdir $(OBJS)\doc
|
||||
for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
|
||||
|
||||
@ -226,4 +223,3 @@ $(OBJS)\help_demo.obj : .AUTODEPEND .\demo.cpp
|
||||
|
||||
$(OBJS)\help_demo.res : .AUTODEPEND .\demo.rc
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user