From a2d6aefcb52649e6c407008db52527544b29ec8d Mon Sep 17 00:00:00 2001
From: Tim Jansen <tim@tjansen.de>
Date: Thu, 6 Dec 2001 21:00:28 +0000
Subject: [PATCH] new project started

svn path=/trunk/kdenetwork/krfb/; revision=125894
---
 Makefile.am      |  4 +---
 krfb.kdevprj     | 12 +++++++++---
 krfb/Makefile.am | 18 +++---------------
 krfb/krfb.cpp    |  2 +-
 krfb/krfb.h      |  2 +-
 5 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2be8c243..2893d8e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = krfb po doc 
 
-EXTRA_DIST = krfb.kdevprj AUTHORS COPYING ChangeLog INSTALL README TODO krfb.lsm 
+EXTRA_DIST = krfb.kdevprj admin AUTHORS COPYING ChangeLog INSTALL README TODO krfb.lsm 
 
 ####### kdevelop will overwrite this part!!! (end)############
 # not a GNU package. You can remove this line, if 
@@ -24,8 +24,6 @@ package-messages:
 	$(MAKE) -f admin/Makefile.common package-messages
 	$(MAKE) -C po merge
 
-EXTRA_DIST = admin 
-
 dist-hook:
 	cd $(top_distdir) && perl admin/am_edit -padmin
 	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
diff --git a/krfb.kdevprj b/krfb.kdevprj
index 9b33fe77..d85808bf 100644
--- a/krfb.kdevprj
+++ b/krfb.kdevprj
@@ -19,7 +19,7 @@ type=DATA
 [Config for BinMakefileAm]
 bin_program=krfb
 cxxflags=-O0 -g3 -Wall
-ldadd=\s-lXext -lX11 $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ldadd=\s$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
 ldflags=\s
 
 [General]
@@ -52,7 +52,7 @@ User Interface=*.kdevdlg,*.ui,*.rc
 groups=Headers,Sources,User Interface,Translations,GNU,Others
 
 [Makefile.am]
-files=krfb.kdevprj,AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,krfb.lsm
+files=krfb.kdevprj,admin,AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,krfb.lsm
 sub_dirs=krfb,po,doc
 type=normal
 
@@ -68,6 +68,12 @@ install=false
 install_location=
 type=DATA
 
+[admin]
+dist=true
+install=false
+install_location=
+type=DATA
+
 [doc/Makefile.am]
 sub_dirs=en
 type=normal
@@ -109,7 +115,7 @@ type=SOURCE
 [krfb/krfb.desktop]
 dist=true
 install=true
-install_location=$$(kde_appsdir)/Applications/krfb.desktop
+install_location=$$(kde_datadir)/kicker/applets/krfb.desktop
 type=DATA
 
 [krfb/krfb.h]
diff --git a/krfb/Makefile.am b/krfb/Makefile.am
index 6929a2db..380c7b75 100644
--- a/krfb/Makefile.am
+++ b/krfb/Makefile.am
@@ -15,13 +15,13 @@ libkrfb_la_SOURCES = myview.ui krfb.cpp
 EXTRA_DIST = krfb.cpp krfb.h myview.ui krfb.desktop lo32-app-krfb.png 
 
 install-data-local:
-	$(mkinstalldirs) $(kde_appsdir)/Applications/
-	$(INSTALL_DATA) $(srcdir)/krfb.desktop $(kde_appsdir)/Applications/krfb.desktop
+	$(mkinstalldirs) $(kde_datadir)/kicker/applets/
+	$(INSTALL_DATA) $(srcdir)/krfb.desktop $(kde_datadir)/kicker/applets/krfb.desktop
 	$(mkinstalldirs) $(kde_icondir)/locolor/32x32/apps/
 	$(INSTALL_DATA) $(srcdir)/lo32-app-krfb.png $(kde_icondir)/locolor/32x32/apps/krfb.png
 
 uninstall-local:
-	-rm -f $(kde_appsdir)/Applications/krfb.desktop
+	-rm -f $(kde_datadir)/kicker/applets/krfb.desktop
 	-rm -f $(kde_icondir)/locolor/32x32/apps/krfb.png
 
 ####### kdevelop will overwrite this part!!! (end)############
@@ -39,12 +39,8 @@ uninstall-local:
 # kde_wallpaperdir  Where general wallpapers should go to.
 
 # set the include path for X, qt and KDE
-INCLUDES= $(all_includes)
 METASOURCES = AUTO
 
-# Set to install the library
-lib_LTLIBRARIES = libkrfb.la
-
 # them while "make clean", use CLEANFILES
 DISTCLEANFILES = $(METASOURCES)
 
@@ -66,11 +62,3 @@ messages:
 		 $(XGETTEXT) -C -ki18n -x $(kde_includes)/kde.pot $$LIST -o ../po/krfb.pot; \
 	fi
 
-install-data-local:
-	$(mkinstalldirs) $(kde_datadir)/kicker/applets/
-	$(INSTALL_DATA) krfb.desktop $(kde_datadir)/kicker/applets/krfb.desktop
- 
-uninstall-local:
-	-rm -f $(kde_datadir)/kicker/applets/krfb.desktop  
-
-
diff --git a/krfb/krfb.cpp b/krfb/krfb.cpp
index 712eaaa3..ac1662cc 100644
--- a/krfb/krfb.cpp
+++ b/krfb/krfb.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
                           krfb.cpp  -  description
                              -------------------
-    begin                : Thu Dec  6 21:46:30 CET 2001
+    begin                : Thu Dec  6 22:00:25 CET 2001
     copyright            : (C) 2001 by Tim Jansen
     email                : tim@tjansen.de
  ***************************************************************************/
diff --git a/krfb/krfb.h b/krfb/krfb.h
index 152e8f48..caeb81fa 100644
--- a/krfb/krfb.h
+++ b/krfb/krfb.h
@@ -1,7 +1,7 @@
 /***************************************************************************
                           krfb.h  -  description
                              -------------------
-    begin                : Thu Dec  6 21:46:30 CET 2001
+    begin                : Thu Dec  6 22:00:25 CET 2001
     copyright            : (C) 2001 by Tim Jansen
     email                : tim@tjansen.de
  ***************************************************************************/