[Wxlua-commit] wxLua/apps Makefile.in,1.66,1.67

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wxlua/wxLua/apps
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30427/apps

Modified Files:
	Makefile.in 
Log Message:
add to the linker the -rpath flag only under Unix

Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** Makefile.in	10 Jan 2008 17:04:24 -0000	1.66
--- Makefile.in	14 Jan 2008 23:30:21 -0000	1.67
***************
*** 1,5 ****
  # =========================================================================
  #     This makefile was generated by
! #     Bakefile 0.2.2 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
--- 1,5 ----
  # =========================================================================
  #     This makefile was generated by
! #     Bakefile 0.2.3 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
***************
*** 10,13 ****
--- 10,14 ----
  prefix = @prefix@
  exec_prefix = @exec_prefix@
+ datarootdir = @datarootdir@
  INSTALL = @INSTALL@
  EXEEXT = @EXEEXT@
***************
*** 40,43 ****
--- 41,45 ----
  LUA_DIR = @LUA_DIR@
  WXLUA_LIBS = @WXLUA_LIBS@
+ RPATH_FLAGS = @RPATH_FLAGS@
  LUA_PLATFORM_SPECIFIC_CFLAGS = @LUA_PLATFORM_SPECIFIC_CFLAGS@
  LUA_PLATFORM_SPECIFIC_LDFLAGS = @LUA_PLATFORM_SPECIFIC_LDFLAGS@
***************
*** 94,100 ****
--- 96,104 ----
  @COND_BUILD_DEBUG_UNICODE_0@WXLIBPOSTFIX = d
  @COND_BUILD_RELEASE_UNICODE_1@WXLIBPOSTFIX = u
+ @COND_PLATFORM_MAC_0@__app_lua___mac_setfilecmd = @true
  @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL ../bin/lua$(EXEEXT)
  @COND_SHARED_0@__app_luac___depname = ../bin/luac$(EXEEXT)
+ @COND_PLATFORM_MAC_0@__app_luac___mac_setfilecmd = @true
  @COND_PLATFORM_MAC_1@__app_luac___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL ../bin/luac$(EXEEXT)
***************
*** 104,107 ****
--- 108,112 ----
  @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@	= \
  @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@	../bin/wxlua$(EXEEXT)
+ @COND_PLATFORM_MAC_0@__app_wxlua___mac_setfilecmd = @true
  @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@	$(SETFILE) -a C ../bin/wxlua$(EXEEXT)
***************
*** 125,128 ****
--- 130,134 ----
  @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \
  @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@	= ../bin/wxluaedit$(EXEEXT)
+ @COND_PLATFORM_MAC_0@__app_wxluaedit___mac_setfilecmd = @true
  @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \
  @COND_PLATFORM_MAC_1@	= $(SETFILE) -a C ../bin/wxluaedit$(EXEEXT)
***************
*** 145,148 ****
--- 151,155 ----
  @COND_PLATFORM_MACOSX_1@	= app_wxluaedit_bundle
  @COND_USE_WXLUACANAPP_1@__app_wxluacan___depname = ../bin/wxluacan$(EXEEXT)
+ @COND_PLATFORM_MAC_0@__app_wxluacan___mac_setfilecmd = @true
  @COND_PLATFORM_MAC_1@__app_wxluacan___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@	$(SETFILE) -a C ../bin/wxluacan$(EXEEXT)
***************
*** 166,169 ****
--- 173,177 ----
  @COND_USE_WXLUAFREEZEAPP_1@__app_wxluafreeze___depname \
  @COND_USE_WXLUAFREEZEAPP_1@	= ../bin/wxluafreeze$(EXEEXT)
+ @COND_PLATFORM_MAC_0@__app_wxluafreeze___mac_setfilecmd = @true
  @COND_PLATFORM_MAC_1@__app_wxluafreeze___mac_setfilecmd \
  @COND_PLATFORM_MAC_1@	= $(SETFILE) -a C ../bin/wxluafreeze$(EXEEXT)
***************
*** 186,190 ****
  @COND_PLATFORM_MACOSX_1@__app_wxluafreeze_bundle___depname \
  @COND_PLATFORM_MACOSX_1@	= app_wxluafreeze_bundle
- @COND_SHARED_1@__app = -Wl,-rpath,../lib

  ### Targets: ###
--- 194,197 ----
***************
*** 222,226 ****

  ../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS)
! 	$(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib  $(__app) $(LUA_PLATFORM_SPECIFIC_LDFLAGS)  $(LIBS) $(WXLUA_LIBS) -lm

  	$(__app_lua___mac_setfilecmd)
--- 229,233 ----

  ../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS)
! 	$(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib  $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS)  $(LIBS) -llua5.1 -lm

  	$(__app_lua___mac_setfilecmd)
***************
*** 234,238 ****

  @COND_SHARED_0@../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS)
! @COND_SHARED_0@	$(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib  $(__app) $(LUA_PLATFORM_SPECIFIC_LDFLAGS)  $(LIBS) $(WXLUA_LIBS) -lm
  @COND_SHARED_0@	
  @COND_SHARED_0@	$(__app_luac___mac_setfilecmd)
--- 241,245 ----

  @COND_SHARED_0@../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS)
! @COND_SHARED_0@	$(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib  $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS)  $(LIBS) -llua5.1 -lm
  @COND_SHARED_0@	
  @COND_SHARED_0@	$(__app_luac___mac_setfilecmd)
***************
*** 246,250 ****

  @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(__app)  $(LIBS) $(WXLUA_LIBS) $(WX_LIBS)
  @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@	$(__app_wxlua___mac_rezcmd)
  @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@	$(__app_wxlua___mac_setfilecmd)
--- 253,257 ----

  @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS)  $(LIBS) $(WXLUA_LIBS) $(WX_LIBS)
  @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@	$(__app_wxlua___mac_rezcmd)
  @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@	$(__app_wxlua___mac_setfilecmd)
***************
*** 281,285 ****

  @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc)
! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@	$(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(__app)  $(LIBS) $(WXLUA_LIBS) -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS)
  @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@	$(__app_wxluaedit___mac_rezcmd)
  @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@	$(__app_wxluaedit___mac_setfilecmd)
--- 288,292 ----

  @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc)
! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@	$(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS)  $(LIBS) $(WXLUA_LIBS) -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS)
  @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@	$(__app_wxluaedit___mac_rezcmd)
  @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@	$(__app_wxluaedit___mac_setfilecmd)
***************
*** 316,320 ****

  @COND_USE_WXLUACANAPP_1@../bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc)
! @COND_USE_WXLUACANAPP_1@	$(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(__app)  $(LIBS) $(WXLUA_LIBS) $(WX_LIBS)
  @COND_USE_WXLUACANAPP_1@	$(__app_wxluacan___mac_rezcmd)
  @COND_USE_WXLUACANAPP_1@	$(__app_wxluacan___mac_setfilecmd)
--- 323,327 ----

  @COND_USE_WXLUACANAPP_1@../bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc)
! @COND_USE_WXLUACANAPP_1@	$(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS)  $(LIBS) $(WXLUA_LIBS) $(WX_LIBS)
  @COND_USE_WXLUACANAPP_1@	$(__app_wxluacan___mac_rezcmd)
  @COND_USE_WXLUACANAPP_1@	$(__app_wxluacan___mac_setfilecmd)
***************
*** 351,355 ****

  @COND_USE_WXLUAFREEZEAPP_1@../bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc)
! @COND_USE_WXLUAFREEZEAPP_1@	$(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(__app)  $(LIBS) $(WXLUA_LIBS) $(WX_LIBS)
  @COND_USE_WXLUAFREEZEAPP_1@	$(__app_wxluafreeze___mac_rezcmd)
  @COND_USE_WXLUAFREEZEAPP_1@	$(__app_wxluafreeze___mac_setfilecmd)
--- 358,362 ----

  @COND_USE_WXLUAFREEZEAPP_1@../bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc)
! @COND_USE_WXLUAFREEZEAPP_1@	$(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS)  $(LIBS) $(WXLUA_LIBS) $(WX_LIBS)
  @COND_USE_WXLUAFREEZEAPP_1@	$(__app_wxluafreeze___mac_rezcmd)
  @COND_USE_WXLUAFREEZEAPP_1@	$(__app_wxluafreeze___mac_setfilecmd)