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

fixed 'make install' I had broken previously

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-12 16:13:29 +00:00
parent ec14dd32d8
commit 9260520f90
2 changed files with 509 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

512
Makefile.in
View File

@@ -1,5 +1,5 @@
# #
# This file was automatically generated by tmake at 18:11, 2000/01/10 # This file was automatically generated by tmake at 17:13, 2000/01/12
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
# #
@@ -47,7 +47,7 @@ VP9 = @top_srcdir@/src/tiff
VP10 = @top_srcdir@/src/zlib VP10 = @top_srcdir@/src/zlib
VP11 = @top_srcdir@/src/iodbc VP11 = @top_srcdir@/src/iodbc
VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10):$(VP11) 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)
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
prefix = @prefix@ prefix = @prefix@
@@ -116,6 +116,7 @@ ZLIBDIR = $(WXDIR)/src/zlib
GTKDIR = $(WXDIR)/src/gtk GTKDIR = $(WXDIR)/src/gtk
MOTIFDIR = $(WXDIR)/src/motif MOTIFDIR = $(WXDIR)/src/motif
MSWDIR = $(WXDIR)/src/msw MSWDIR = $(WXDIR)/src/msw
PMDIR = $(WXDIR)/src/os2
ODBCDIR = $(WXDIR)/src/iodbc ODBCDIR = $(WXDIR)/src/iodbc
INCDIR = $(WXDIR)/include INCDIR = $(WXDIR)/include
SAMPDIR = $(WXDIR)/samples SAMPDIR = $(WXDIR)/samples
@@ -585,6 +586,80 @@ MSW_HEADERS = \
msw/winundef.h \ msw/winundef.h \
msw/xpmhand.h msw/xpmhand.h
PM_HEADERS = \
os2/accel.h \
os2/app.h \
os2/bitmap.h \
os2/bmpbuttn.h \
os2/brush.h \
os2/button.h \
os2/checkbox.h \
os2/checklst.h \
os2/choice.h \
os2/clipbrd.h \
os2/colour.h \
os2/combobox.h \
os2/control.h \
os2/cursor.h \
os2/dataform.h \
os2/dataobj.h \
os2/dataobj2.h \
os2/dc.h \
os2/dcclient.h \
os2/dcmemory.h \
os2/dcprint.h \
os2/dcscreen.h \
os2/dialog.h \
os2/dirdlg.h \
os2/dnd.h \
os2/filedlg.h \
os2/font.h \
os2/fontdlg.h \
os2/frame.h \
os2/gauge.h \
os2/gdiimage.h \
os2/gdiobj.h \
os2/gsockos2.h \
os2/helpwin.h \
os2/icon.h \
os2/iniconf.h \
os2/joystick.h \
os2/listbox.h \
os2/mdi.h \
os2/menu.h \
os2/menuitem.h \
os2/metafile.h \
os2/minifram.h \
os2/msgdlg.h \
os2/notebook.h \
os2/palette.h \
os2/pen.h \
os2/pnghand.h \
os2/pngread.h \
os2/print.h \
os2/private.h \
os2/radiobox.h \
os2/radiobut.h \
os2/region.h \
os2/scrolbar.h \
os2/settings.h \
os2/setup0.h \
os2/slider.h \
os2/spinbutt.h \
os2/spinctrl.h \
os2/statbmp.h \
os2/statbox.h \
os2/statline.h \
os2/stattext.h \
os2/tabctrl.h \
os2/taskbar.h \
os2/textctrl.h \
os2/timer.h \
os2/toolbar.h \
os2/tooltip.h \
os2/wave.h \
os2/window.h
UNIX_HEADERS = \ UNIX_HEADERS = \
unix/execute.h \ unix/execute.h \
unix/fontutil.h unix/fontutil.h
@@ -1845,6 +1920,424 @@ MSW_GUIDEPS = \
window.d \ window.d \
xpmhand.d xpmhand.d
PM_GENERICOBJS = \
busyinfo.o \
calctrl.o \
caret.o \
choicdgg.o \
colrdlgg.o \
dcpsg.o \
grid.o \
helpext.o \
helphtml.o \
helpwxht.o \
helpxlp.o \
imaglist.o \
laywin.o \
listctrl.o \
logg.o \
msgdlgg.o \
numdlgg.o \
panelg.o \
printps.o \
prntdlgg.o \
progdlgg.o \
prop.o \
propform.o \
proplist.o \
sashwin.o \
scrolwin.o \
splitter.o \
statusbr.o \
tbarsmpl.o \
textdlgg.o \
tipdlg.o \
treectrl.o \
wizard.o
PM_GENERICDEPS = \
busyinfo.d \
calctrl.d \
caret.d \
choicdgg.d \
colrdlgg.d \
dcpsg.d \
grid.d \
helpext.d \
helphtml.d \
helpwxht.d \
helpxlp.d \
imaglist.d \
laywin.d \
listctrl.d \
logg.d \
msgdlgg.d \
numdlgg.d \
panelg.d \
printps.d \
prntdlgg.d \
progdlgg.d \
prop.d \
propform.d \
proplist.d \
sashwin.d \
scrolwin.d \
splitter.d \
statusbr.d \
tbarsmpl.d \
textdlgg.d \
tipdlg.d \
treectrl.d \
wizard.d
PM_COMMONOBJS = \
parser.o \
appcmn.o \
choiccmn.o \
clipcmn.o \
cmdline.o \
cmndata.o \
config.o \
ctrlcmn.o \
ctrlsub.o \
datetime.o \
datstrm.o \
db.o \
dbtable.o \
dcbase.o \
dlgcmn.o \
dobjcmn.o \
docmdi.o \
docview.o \
dynarray.o \
dynlib.o \
encconv.o \
event.o \
extended.o \
ffile.o \
file.o \
fileconf.o \
filefn.o \
filesys.o \
fontcmn.o \
fontmap.o \
framecmn.o \
fs_inet.o \
fs_zip.o \
ftp.o \
gdicmn.o \
gifdecod.o \
hash.o \
helpbase.o \
http.o \
imagall.o \
imagbmp.o \
image.o \
imaggif.o \
imagjpeg.o \
imagpcx.o \
imagpng.o \
imagpnm.o \
imagtiff.o \
intl.o \
ipcbase.o \
layout.o \
lboxcmn.o \
list.o \
log.o \
longlong.o \
memory.o \
menucmn.o \
mimetype.o \
module.o \
mstream.o \
object.o \
objstrm.o \
odbc.o \
paper.o \
prntbase.o \
process.o \
protocol.o \
resource.o \
sckaddr.o \
sckfile.o \
sckipc.o \
sckstrm.o \
serbase.o \
sizer.o \
socket.o \
strconv.o \
stream.o \
string.o \
tbarbase.o \
textcmn.o \
textfile.o \
timercmn.o \
tokenzr.o \
txtstrm.o \
unzip.o \
url.o \
utilscmn.o \
valgen.o \
validate.o \
valtext.o \
variant.o \
wfstream.o \
wincmn.o \
wxchar.o \
wxexpr.o \
zipstrm.o \
zstream.o
PM_COMMONDEPS = \
parser.d \
appcmn.d \
choiccmn.d \
clipcmn.d \
cmdline.d \
cmndata.d \
config.d \
ctrlcmn.d \
ctrlsub.d \
datetime.d \
datstrm.d \
db.d \
dbtable.d \
dcbase.d \
dlgcmn.d \
dobjcmn.d \
docmdi.d \
docview.d \
dynarray.d \
dynlib.d \
encconv.d \
event.d \
extended.d \
ffile.d \
file.d \
fileconf.d \
filefn.d \
filesys.d \
fontcmn.d \
fontmap.d \
framecmn.d \
fs_inet.d \
fs_zip.d \
ftp.d \
gdicmn.d \
gifdecod.d \
hash.d \
helpbase.d \
http.d \
imagall.d \
imagbmp.d \
image.d \
imaggif.d \
imagjpeg.d \
imagpcx.d \
imagpng.d \
imagpnm.d \
imagtiff.d \
intl.d \
ipcbase.d \
layout.d \
lboxcmn.d \
list.d \
log.d \
longlong.d \
memory.d \
menucmn.d \
mimetype.d \
module.d \
mstream.d \
object.d \
objstrm.d \
odbc.d \
paper.d \
prntbase.d \
process.d \
protocol.d \
resource.d \
sckaddr.d \
sckfile.d \
sckipc.d \
sckstrm.d \
serbase.d \
sizer.d \
socket.d \
strconv.d \
stream.d \
string.d \
tbarbase.d \
textcmn.d \
textfile.d \
timercmn.d \
tokenzr.d \
txtstrm.d \
unzip.d \
url.d \
utilscmn.d \
valgen.d \
validate.d \
valtext.d \
variant.d \
wfstream.d \
wincmn.d \
wxchar.d \
wxexpr.d \
zipstrm.d \
zstream.d
PM_GUIOBJS = \
accel.o \
app.o \
bitmap.o \
bmpbuttn.o \
brush.o \
button.o \
checkbox.o \
checklst.o \
choice.o \
clipbrd.o \
colour.o \
combobox.o \
control.o \
cursor.o \
data.o \
dataobj.o \
dc.o \
dcclient.o \
dcmemory.o \
dcprint.o \
dcscreen.o \
dialog.o \
dirdlg.o \
dnd.o \
filedlg.o \
font.o \
fontdlg.o \
frame.o \
gauge.o \
gdiimage.o \
gdiobj.o \
gsocket.o \
helpwin.o \
icon.o \
iniconf.o \
joystick.o \
listbox.o \
main.o \
mdi.o \
menu.o \
menuitem.o \
metafile.o \
minifram.o \
msgdlg.o \
nativdlg.o \
notebook.o \
ownerdrw.o \
palette.o \
pen.o \
print.o \
radiobox.o \
radiobut.o \
region.o \
scrolbar.o \
settings.o \
slider.o \
spinbutt.o \
spinctrl.o \
statbmp.o \
statbox.o \
statline.o \
stattext.o \
tabctrl.o \
taskbar.o \
textctrl.o \
thread.o \
timer.o \
toolbar.o \
tooltip.o \
utils.o \
utilsexc.o \
wave.o \
window.o
PM_GUIDEPS = \
accel.d \
app.d \
bitmap.d \
bmpbuttn.d \
brush.d \
button.d \
checkbox.d \
checklst.d \
choice.d \
clipbrd.d \
colour.d \
combobox.d \
control.d \
cursor.d \
data.d \
dataobj.d \
dc.d \
dcclient.d \
dcmemory.d \
dcprint.d \
dcscreen.d \
dialog.d \
dirdlg.d \
dnd.d \
filedlg.d \
font.d \
fontdlg.d \
frame.d \
gauge.d \
gdiimage.d \
gdiobj.d \
gsocket.d \
helpwin.d \
icon.d \
iniconf.d \
joystick.d \
listbox.d \
main.d \
mdi.d \
menu.d \
menuitem.d \
metafile.d \
minifram.d \
msgdlg.d \
nativdlg.d \
notebook.d \
ownerdrw.d \
palette.d \
pen.d \
print.d \
radiobox.d \
radiobut.d \
region.d \
scrolbar.d \
settings.d \
slider.d \
spinbutt.d \
spinctrl.d \
statbmp.d \
statbox.d \
statline.d \
stattext.d \
tabctrl.d \
taskbar.d \
textctrl.d \
thread.d \
timer.d \
toolbar.d \
tooltip.d \
utils.d \
utilsexc.d \
wave.d \
window.d
BASE_OBJS = \ BASE_OBJS = \
init.o \ init.o \
appcmn.o \ appcmn.o \
@@ -2180,11 +2673,11 @@ parser.c: $(COMMDIR)/parser.y lexer.c
lexer.c: $(COMMDIR)/lexer.l lexer.c: $(COMMDIR)/lexer.l
$(LEX) $(COMMDIR)/lexer.l $(LEX) $(COMMDIR)/lexer.l
@sed -e "s;$(COMMDIR)/lex.yy.c;lexer.l;g" < lex.yy.c | \ @sed -e "s;$(COMMDIR)/@LEX_STEM@.c;lexer.l;g" < @LEX_STEM@.c | \
sed -e "s/yy/PROIO_yy/g" | \ sed -e "s/yy/PROIO_yy/g" | \
sed -e "s/input/PROIO_input/g" | \ sed -e "s/input/PROIO_input/g" | \
sed -e "s/unput/PROIO_unput/g" > lexer.c sed -e "s/unput/PROIO_unput/g" > lexer.c
@$(RM) lex.yy.c @$(RM) @LEX_STEM@.c
-include $(DEPFILES) -include $(DEPFILES)
@@ -2215,15 +2708,16 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
$(INSTALL) -d $(includedir)/wx $(INSTALL) -d $(includedir)/wx
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/protocol; fi @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/unix; fi @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/protocol; fi
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/generic; 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 \ @list='$(HEADERS)'; for p in $$list; do \
$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \ $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \ echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
done done
write_message: write_message:
@echo " " @echo " "
@echo " The installation of wxWindows is finished. On certain" @echo " The installation of wxWindows is finished. On certain"

11
distrib/msw/tmake/unx.t
View File

@@ -704,15 +704,16 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
$(INSTALL) -d $(includedir)/wx $(INSTALL) -d $(includedir)/wx
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/protocol; fi @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/unix; fi @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/protocol; fi
@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/generic; 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 \ @list='$(HEADERS)'; for p in $$list; do \
$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \ $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \ echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
done done
write_message: write_message:
@echo " " @echo " "
@echo " The installation of wxWindows is finished. On certain" @echo " The installation of wxWindows is finished. On certain"