From 8d0a0392cdab12f05ae60e780e63f621ac9a3641 Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@ximian.com>
Date: Mon, 12 Mar 2001 22:40:07 +0000
Subject: PISOCK_INCLUDEDIR has become PISOCK_CFLAGS in gnome-pilot.m4 and
 remove

2001-03-09  JP Rosevear  <jpr@ximian.com>

	* conduit/Makefile.am: PISOCK_INCLUDEDIR has become
	PISOCK_CFLAGS in gnome-pilot.m4 and remove capplet foo

svn path=/trunk/; revision=8650
---
 addressbook/conduit/Makefile.am | 33 ++-------------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

(limited to 'addressbook/conduit/Makefile.am')

diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index 28b5164c23..ab5ea0ec50 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -4,26 +4,9 @@ INCLUDES = 					\
 	-I$(top_srcdir)/addressbook/backend	\
 	-I$(top_builddir)/e-util		\
 	$(BONOBO_GNOME_CFLAGS)			\
-	$(PISOCK_INCLUDEDIR)			\
+	$(PISOCK_CFLAGS)			\
 	$(GNOME_PILOT_CFLAGS)
 
-# Address Capplet
-bin_PROGRAMS = e-address-conduit-control-applet
-
-e_address_conduit_control_applet_SOURCES = address-conduit-control-applet.c
-
-e_address_conduit_control_applet_LDADD = 	\
-		$(CAPPLET_LIBS)  		\
-		$(GNOME_LIBDIR) 		\
-		$(GNOME_PILOT_LIBS) 		\
-		$(PISOCK_LIBS) 			\
-		$(GNOME_CAPPLET_LIBS) 		\
-		$(BONOBO_GNOME_LIBS) 		\
-		$(GNOME_XML_LIB) 		\
-	        $(GNOMEUI_LIBS) 		\
-                $(INTLLIBS)
-
-
 # Address Conduit
 e_address_conduitsdir=$(libdir)/gnome-pilot/conduits
 e_address_conduits_LTLIBRARIES = libeaddress_conduit.la
@@ -54,23 +37,11 @@ e-address.conduit: e-address.conduit.in Makefile
 	&& mv e-address.conduit.tmp e-address.conduit
 
 
-ccenterdir = $(datadir)/control-center
-ccenterPalmPilotdir = $(ccenterdir)/Peripherals
-ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
-ccenterConduits_in_files = e-address-conduit-control-applet.desktop.in 
-ccenterConduits_DATA = $(ccenterConduits_in_files:.desktop.in=.desktop)
-@XML_I18N_MERGE_DESKTOP_RULE@
-
-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-panelConduits_DATA = $(ccenterConduits_DATA)
-
 Conduitdir = $(datadir)/gnome-pilot/conduits/
 Conduit_DATA = e-address.conduit
 
 EXTRA_DIST = \
-	e-address.conduit.in \
-        $(ccenterConduits_in_files)
+	e-address.conduit.in
 
 install-data-local:
-	$(mkinstalldirs) $(ccenterConduitsdir)
 	$(mkinstalldirs) $(Conduitdir)
-- 
cgit v1.2.3