fixes for 'make install' for wxBase - seems to work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
6c8f8bc534
commit
dad6c0ea77
40
Makefile.in
40
Makefile.in
@ -1,5 +1,5 @@
|
||||
#
|
||||
# This file was automatically generated by tmake at 19:06, 2000/01/05
|
||||
# This file was automatically generated by tmake at 18:11, 2000/01/10
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
|
||||
|
||||
#
|
||||
@ -96,6 +96,8 @@ host_triplet = @host@
|
||||
target_alias = @target_alias@
|
||||
target_triplet = @target@
|
||||
|
||||
USE_GUI=@USE_GUI@
|
||||
|
||||
############################# Dirs #################################
|
||||
|
||||
WXDIR = $(top_srcdir)
|
||||
@ -132,7 +134,8 @@ DISTDIR = ./_dist_dir/wx$(TOOLKIT)
|
||||
|
||||
BASE_HEADERS = \
|
||||
app.h \
|
||||
cmdline.cpp \
|
||||
buffer.h \
|
||||
cmdline.h \
|
||||
date.h \
|
||||
datetime.h \
|
||||
debug.h \
|
||||
@ -146,14 +149,15 @@ BASE_HEADERS = \
|
||||
fileconf.h \
|
||||
hash.h \
|
||||
intl.h \
|
||||
ioswrap.h \
|
||||
list.h \
|
||||
log.h \
|
||||
longlong.h \
|
||||
memory.h \
|
||||
mimetype.h \
|
||||
module.h \
|
||||
object.h \
|
||||
process.h \
|
||||
setup.h \
|
||||
strconv.h \
|
||||
stream.h \
|
||||
string.h \
|
||||
@ -188,7 +192,7 @@ WX_HEADERS = \
|
||||
choicdlg.h \
|
||||
choice.h \
|
||||
clipbrd.h \
|
||||
cmdline.cpp \
|
||||
cmdline.h \
|
||||
cmndata.h \
|
||||
colordlg.h \
|
||||
colour.h \
|
||||
@ -2184,6 +2188,14 @@ lexer.c: $(COMMDIR)/lexer.l
|
||||
|
||||
-include $(DEPFILES)
|
||||
|
||||
afminstall:
|
||||
$(INSTALL) -d $(datadir)
|
||||
$(INSTALL) -d $(datadir)/wx
|
||||
$(INSTALL) -d $(datadir)/wx/afm
|
||||
$(INSTALL) -d $(datadir)/wx/gs_afm
|
||||
$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
|
||||
$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
|
||||
|
||||
preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
|
||||
@echo " "
|
||||
@echo " Installing wxWindows..."
|
||||
@ -2192,7 +2204,6 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
|
||||
$(INSTALL) -d $(prefix)
|
||||
$(INSTALL) -d $(bindir)
|
||||
$(INSTALL) -d $(libdir)
|
||||
$(INSTALL) -d $(datadir)
|
||||
|
||||
$(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
|
||||
$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
|
||||
@ -2203,20 +2214,11 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
|
||||
$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
|
||||
$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
|
||||
|
||||
$(INSTALL) -d $(datadir)/wx
|
||||
$(INSTALL) -d $(datadir)/wx/afm
|
||||
$(INSTALL) -d $(datadir)/wx/gs_afm
|
||||
$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
|
||||
$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
|
||||
|
||||
$(INSTALL) -d $(includedir)/wx
|
||||
$(INSTALL) -d $(includedir)/wx/msw
|
||||
$(INSTALL) -d $(includedir)/wx/gtk
|
||||
$(INSTALL) -d $(includedir)/wx/motif
|
||||
$(INSTALL) -d $(includedir)/wx/html
|
||||
$(INSTALL) -d $(includedir)/wx/protocol
|
||||
$(INSTALL) -d $(includedir)/wx/unix
|
||||
$(INSTALL) -d $(includedir)/wx/generic
|
||||
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
|
||||
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/protocol; fi
|
||||
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/unix; fi
|
||||
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
|
||||
@list='$(HEADERS)'; for p in $$list; do \
|
||||
$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
|
||||
echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
|
||||
@ -2234,7 +2236,7 @@ write_message:
|
||||
@echo " Read the wxWindows Licence on licencing conditions."
|
||||
@echo " "
|
||||
|
||||
install: preinstall @WX_ALL_INSTALLED@ write_message
|
||||
install: preinstall @AFMINSTALL@ @WX_ALL_INSTALLED@ write_message
|
||||
|
||||
uninstall:
|
||||
@echo " "
|
||||
|
||||
12
configure.in
12
configure.in
@ -1445,8 +1445,12 @@ dnl ----------------------------------------------------------------
|
||||
dnl search for toolkit (widget sets)
|
||||
dnl ----------------------------------------------------------------
|
||||
|
||||
AFMINSTALL=
|
||||
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
|
||||
USE_GUI=1
|
||||
|
||||
TOOLKIT=
|
||||
TOOLKIT_INCLUDE=
|
||||
|
||||
@ -1518,6 +1522,8 @@ dnl )
|
||||
GUI_TK_LIBRARY="$GTK_LIBS -lgthread"
|
||||
TOOLKIT=GTK
|
||||
|
||||
AFMINSTALL=afminstall
|
||||
|
||||
GUIOBJS="\$(GTK_GUIOBJS)"
|
||||
GUIHEADERS="\$(GTK_HEADERS)"
|
||||
COMMONOBJS="\$(GTK_COMMONOBJS)"
|
||||
@ -1598,6 +1604,8 @@ if test "$wxUSE_MOTIF" = 1; then
|
||||
GUI_TK_LIBRARY="$X_LIBS"
|
||||
TOOLKIT_INCLUDE="$X_CFLAGS"
|
||||
|
||||
AFMINSTALL=afminstall
|
||||
|
||||
dnl manual check for X11 headers/libs
|
||||
dnl
|
||||
dnl AC_MSG_CHECKING(for X11 headers)
|
||||
@ -1734,6 +1742,8 @@ WX_LIBRARY="wx_${TOOLKIT_DIR}"
|
||||
else
|
||||
dnl leave all TOOLKIT_XXX vars empty
|
||||
|
||||
USE_GUI=0
|
||||
|
||||
dnl the sources, their dependenices and the headers
|
||||
ALL_OBJECTS="\$(BASE_OBJS)"
|
||||
ALL_DEPFILES="\${BASE_DEPS}"
|
||||
@ -3223,6 +3233,8 @@ dnl debugging options
|
||||
AC_SUBST(WXDEBUG_DEFINE)
|
||||
|
||||
dnl toolkit options
|
||||
AC_SUBST(USE_GUI)
|
||||
AC_SUBST(AFMINSTALL)
|
||||
AC_SUBST(TOOLKIT)
|
||||
AC_SUBST(TOOLKIT_DEF)
|
||||
AC_SUBST(TOOLKIT_DIR)
|
||||
|
||||
@ -521,7 +521,7 @@ app.h W B
|
||||
bitmap.h W
|
||||
bmpbuttn.h W
|
||||
brush.h W
|
||||
buffer.h W
|
||||
buffer.h W B
|
||||
busyinfo.h W
|
||||
button.h W
|
||||
calctrl.h W
|
||||
@ -531,7 +531,7 @@ checklst.h W
|
||||
choicdlg.h W
|
||||
choice.h W
|
||||
clipbrd.h W
|
||||
cmdline.cpp W B
|
||||
cmdline.h W B
|
||||
cmndata.h W
|
||||
colordlg.h W
|
||||
colour.h W
|
||||
@ -607,7 +607,7 @@ imagtiff.h W
|
||||
imagjpeg.h W
|
||||
imaglist.h W
|
||||
intl.h W B
|
||||
ioswrap.h W
|
||||
ioswrap.h W B
|
||||
ipcbase.h W
|
||||
joystick.h W
|
||||
layout.h W
|
||||
@ -619,7 +619,7 @@ log.h W B
|
||||
longlong.h W B
|
||||
matrix.h W
|
||||
mdi.h W
|
||||
memory.h W
|
||||
memory.h W B
|
||||
menu.h W
|
||||
menuitem.h W
|
||||
metafile.h W
|
||||
@ -657,7 +657,7 @@ scrolbar.h W
|
||||
scrolwin.h W
|
||||
serbase.h W
|
||||
settings.h W
|
||||
setup.h W B
|
||||
setup.h W
|
||||
sizer.h W
|
||||
slider.h W
|
||||
socket.h W
|
||||
|
||||
@ -305,6 +305,8 @@ host_triplet = @host@
|
||||
target_alias = @target_alias@
|
||||
target_triplet = @target@
|
||||
|
||||
USE_GUI=@USE_GUI@
|
||||
|
||||
############################# Dirs #################################
|
||||
|
||||
WXDIR = $(top_srcdir)
|
||||
@ -675,6 +677,14 @@ lexer.c: $(COMMDIR)/lexer.l
|
||||
|
||||
-include $(DEPFILES)
|
||||
|
||||
afminstall:
|
||||
$(INSTALL) -d $(datadir)
|
||||
$(INSTALL) -d $(datadir)/wx
|
||||
$(INSTALL) -d $(datadir)/wx/afm
|
||||
$(INSTALL) -d $(datadir)/wx/gs_afm
|
||||
$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
|
||||
$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
|
||||
|
||||
preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
|
||||
@echo " "
|
||||
@echo " Installing wxWindows..."
|
||||
@ -683,7 +693,6 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
|
||||
$(INSTALL) -d $(prefix)
|
||||
$(INSTALL) -d $(bindir)
|
||||
$(INSTALL) -d $(libdir)
|
||||
$(INSTALL) -d $(datadir)
|
||||
|
||||
$(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
|
||||
$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
|
||||
@ -694,20 +703,11 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
|
||||
$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
|
||||
$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
|
||||
|
||||
$(INSTALL) -d $(datadir)/wx
|
||||
$(INSTALL) -d $(datadir)/wx/afm
|
||||
$(INSTALL) -d $(datadir)/wx/gs_afm
|
||||
$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
|
||||
$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
|
||||
|
||||
$(INSTALL) -d $(includedir)/wx
|
||||
$(INSTALL) -d $(includedir)/wx/msw
|
||||
$(INSTALL) -d $(includedir)/wx/gtk
|
||||
$(INSTALL) -d $(includedir)/wx/motif
|
||||
$(INSTALL) -d $(includedir)/wx/html
|
||||
$(INSTALL) -d $(includedir)/wx/protocol
|
||||
$(INSTALL) -d $(includedir)/wx/unix
|
||||
$(INSTALL) -d $(includedir)/wx/generic
|
||||
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
|
||||
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/protocol; fi
|
||||
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/unix; fi
|
||||
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
|
||||
@list='$(HEADERS)'; for p in $$list; do \
|
||||
$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
|
||||
echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
|
||||
@ -725,7 +725,7 @@ write_message:
|
||||
@echo " Read the wxWindows Licence on licencing conditions."
|
||||
@echo " "
|
||||
|
||||
install: preinstall @WX_ALL_INSTALLED@ write_message
|
||||
install: preinstall @AFMINSTALL@ @WX_ALL_INSTALLED@ write_message
|
||||
|
||||
uninstall:
|
||||
@echo " "
|
||||
|
||||
Loading…
Reference in New Issue
Block a user