Update of /cvsroot/wxlua/wxLua/apps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32251/apps
Modified Files:
Makefile.in
Log Message:
fixed install/uninstall under linux
Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.in 23 Jan 2006 19:38:29 -0000 1.13
--- Makefile.in 23 Jan 2006 21:20:28 -0000 1.14
***************
*** 14,19 ****
--- 14,23 ----
WINDRES = @WINDRES@
SETFILE = @SETFILE@
+ STRIP = @STRIP@
NM = @NM@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DIR = @INSTALL_DIR@
top_builddir = @top_builddir@
+ bindir = @bindir@
LDFLAGS_GUI = @LDFLAGS_GUI@
CXX = @CXX@
***************
*** 49,52 ****
--- 53,58 ----
grep -q pmwin.763 ; then emxbind -ep wxlua$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__app_wxlua___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___app_wxlua___os2_emxbindcmd)
+ @COND_USE_WXLUAAPP_1@__install_app_wxlua___depname = install_app_wxlua
+ @COND_USE_WXLUAAPP_1@__uninstall_app_wxlua___depname = uninstall_app_wxlua
@COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o
@COND_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \
***************
*** 57,60 ****
--- 63,70 ----
wxluaedit$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep wxluaedit$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__app_wxluaedit___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___app_wxluaedit___os2_emxbindcmd)
+ @COND_USE_WXLUAEDITAPP_1@__install_app_wxluaedit___depname \
+ @COND_USE_WXLUAEDITAPP_1@ = install_app_wxluaedit
+ @COND_USE_WXLUAEDITAPP_1@__uninstall_app_wxluaedit___depname \
+ @COND_USE_WXLUAEDITAPP_1@ = uninstall_app_wxluaedit
@COND_PLATFORM_WIN32_1@__app_wxluaedit___win32rc = \
@COND_PLATFORM_WIN32_1@ app_wxluaedit_wxluaedit_rc.o
***************
*** 64,72 ****
all: $(__app_wxlua___depname) $(__app_wxluaedit___depname)
! install: all
! uninstall:
install-strip: install
clean:
--- 74,84 ----
all: $(__app_wxlua___depname) $(__app_wxluaedit___depname)
! install: all $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname)
! uninstall: $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname)
install-strip: install
+ $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT)
+ $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT)
clean:
***************
*** 85,88 ****
--- 97,107 ----
@COND_USE_WXLUAAPP_1@ $(__app_wxlua___os2_emxbindcmd)
+ @COND_USE_WXLUAAPP_1@install_app_wxlua:
+ @COND_USE_WXLUAAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+ @COND_USE_WXLUAAPP_1@ $(INSTALL_PROGRAM) ../bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir)
+
+ @COND_USE_WXLUAAPP_1@uninstall_app_wxlua:
+ @COND_USE_WXLUAAPP_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT)
+
@COND_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc)
@COND_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI) -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua $(WX_LIBS)
***************
*** 91,94 ****
--- 110,120 ----
@COND_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___os2_emxbindcmd)
+ @COND_USE_WXLUAEDITAPP_1@install_app_wxluaedit:
+ @COND_USE_WXLUAEDITAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+ @COND_USE_WXLUAEDITAPP_1@ $(INSTALL_PROGRAM) ../bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir)
+
+ @COND_USE_WXLUAEDITAPP_1@uninstall_app_wxluaedit:
+ @COND_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT)
+
app_wxlua_wxlua.o: ./wxlua/src/wxlua.cpp
$(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) ./wxlua/src/wxlua.cpp
***************
*** 113,115 ****
@IF_GNU_MAKE@-include .deps/*.d
! .PHONY: all install uninstall clean distclean
--- 139,141 ----
@IF_GNU_MAKE@-include .deps/*.d
! .PHONY: all install uninstall clean distclean install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit
|
