[rkward-cvs] rkward/rkward Makefile.am,1.60,1.61

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24860/rkward

Modified Files:
	Makefile.am 
Log Message:
Automake adjustments in preparation for using a wrapper script. The binary is now built in rkward.bin

Index: Makefile.am
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/Makefile.am,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** Makefile.am	10 Oct 2005 19:32:02 -0000	1.60
--- Makefile.am	10 Nov 2005 21:22:38 -0000	1.61
***************
*** 1,12 ****
! ####### kdevelop will overwrite this part!!! (begin)##########
! bin_PROGRAMS = rkward
  
! ## INCLUDES were found outside kdevelop specific part
  
! rkward_SOURCES = rkwatch.cpp rkward.cpp main.cpp \
  	rkcommandeditor.cpp rkglobals.cpp robjectbrowser.cpp rkeditormanager.cpp robjectviewer.cpp \
  	khelpdlg.cpp rkconsole.cpp rkward.skel
  
! rkward_LDADD = $(top_builddir)/rkward/windows/libwindows.a \
  	$(top_builddir)/rkward/agents/libagents.a $(top_builddir)/rkward/dialogs/libdialogs.a \
  	$(top_builddir)/rkward/plugin/libplugin.a $(top_builddir)/rkward/settings/libsettings.a \
--- 1,30 ----
! # These paths are KDE specific. Use them:
! # kde_appsdir         Where your application's menu entry (.desktop) should go to.
! # kde_icondir         Where your icon should go to - better use KDE_ICON.
! # kde_sounddir        Where your sounds should go to.
! # kde_htmldir         Where your docs should go to. (contains lang subdirs)
! # kde_datadir         Where you install application data. (Use a subdir)
! # kde_locale          Where translation files should go to. (contains lang subdirs)
! # kde_cgidir          Where cgi-bin executables should go to.
! # kde_confdir         Where config files should go to (system-wide ones with default values).
! # kde_mimedir         Where mimetypes .desktop files should go to.
! # kde_servicesdir     Where services .desktop files should go to.
! # kde_servicetypesdir Where servicetypes .desktop files should go to.
! # kde_toolbardir      Where general toolbar icons should go to (deprecated, use KDE_ICON).
! # kde_wallpaperdir    Where general wallpapers should go to.
! # kde_templatesdir    Where templates for the "New" menu (Konqueror/KDesktop) should go to.
! # kde_bindir          Where executables should go to. Use bin_PROGRAMS or bin_SCRIPTS.
! # kde_libdir          Where shared libraries should go to. Use lib_LTLIBRARIES.
! # kde_moduledir       Where modules (e.g. parts) should go to. Use kde_module_LTLIBRARIES.
! # kde_styledir        Where Qt/KDE widget styles should go to (new in KDE 3).
! # kde_designerdir     Where Qt Designer plugins should go to (new in KDE 3).
  
! bin_PROGRAMS = rkward.bin
  
! rkward_bin_SOURCES = rkwatch.cpp rkward.cpp main.cpp \
  	rkcommandeditor.cpp rkglobals.cpp robjectbrowser.cpp rkeditormanager.cpp robjectviewer.cpp \
  	khelpdlg.cpp rkconsole.cpp rkward.skel
  
! rkward_bin_LDADD = $(top_builddir)/rkward/windows/libwindows.a \
  	$(top_builddir)/rkward/agents/libagents.a $(top_builddir)/rkward/dialogs/libdialogs.a \
  	$(top_builddir)/rkward/plugin/libplugin.a $(top_builddir)/rkward/settings/libsettings.a \
***************
*** 14,18 ****
  	$(top_builddir)/rkward/rbackend/librbackend.a $(top_builddir)/rkward/scriptbackends/libscriptbackends.a \
  	$(top_builddir)/rkward/misc/libmisc.a -lkhtml -lkmdi $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) \
! 	$(LIBSOCKET) -lR -lkatepartinterfaces
  
  SUBDIRS = plugins dataeditor settings plugin agents rbackend scriptbackends \
--- 32,36 ----
  	$(top_builddir)/rkward/rbackend/librbackend.a $(top_builddir)/rkward/scriptbackends/libscriptbackends.a \
  	$(top_builddir)/rkward/misc/libmisc.a -lkhtml -lkmdi $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) \
! 	$(LIBSOCKET) -L$(R_HOMEDIR)/lib -lR -lkatepartinterfaces
  
  SUBDIRS = plugins dataeditor settings plugin agents rbackend scriptbackends \
***************
*** 32,57 ****
  	-rm -f $(kde_icondir)/locolor/16x16/apps/rkward.png
  
- ####### kdevelop will overwrite this part!!! (end)############
- # These paths are KDE specific. Use them:
- # kde_appsdir         Where your application's menu entry (.desktop) should go to.
- # kde_icondir         Where your icon should go to - better use KDE_ICON.
- # kde_sounddir        Where your sounds should go to.
- # kde_htmldir         Where your docs should go to. (contains lang subdirs)
- # kde_datadir         Where you install application data. (Use a subdir)
- # kde_locale          Where translation files should go to. (contains lang subdirs)
- # kde_cgidir          Where cgi-bin executables should go to.
- # kde_confdir         Where config files should go to (system-wide ones with default values).
- # kde_mimedir         Where mimetypes .desktop files should go to.
- # kde_servicesdir     Where services .desktop files should go to.
- # kde_servicetypesdir Where servicetypes .desktop files should go to.
- # kde_toolbardir      Where general toolbar icons should go to (deprecated, use KDE_ICON).
- # kde_wallpaperdir    Where general wallpapers should go to.
- # kde_templatesdir    Where templates for the "New" menu (Konqueror/KDesktop) should go to.
- # kde_bindir          Where executables should go to. Use bin_PROGRAMS or bin_SCRIPTS.
- # kde_libdir          Where shared libraries should go to. Use lib_LTLIBRARIES.
- # kde_moduledir       Where modules (e.g. parts) should go to. Use kde_module_LTLIBRARIES.
- # kde_styledir        Where Qt/KDE widget styles should go to (new in KDE 3).
- # kde_designerdir     Where Qt Designer plugins should go to (new in KDE 3).
- 
  # set the include path for X, qt and KDE
  INCLUDES = $(all_includes)
--- 50,53 ----
***************
*** 60,68 ****
  
  # the library search path. 
! rkward_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  rcdir = $(kde_datadir)/rkward
  rc_DATA = rkwardui.rc rkconsolepart.rc
  
  messages: rc.cpp
  	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
--- 56,73 ----
  
  # the library search path. 
! rkward_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  rcdir = $(kde_datadir)/rkward
  rc_DATA = rkwardui.rc rkconsolepart.rc
  
+ bin_SCRIPTS = rkward
+ 
+ # well, of course this is not the real thing yet. TODO: generate a wrapper
+ rkward:
+ 	echo "$(kde_bindir)/rkward.bin" > rkward; \
+ 	chmod 744 rkward
+ 
+ CLEANFILES = rkward
+ 
  messages: rc.cpp
  	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \