Fix kpilot build system

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1238887 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 7047c45c26
commit e340db6499

@ -1,4 +1,4 @@
## kdepim/kpilot/Makefile.am ## Makefile.am
## (C) 1997 Stephan Kulow ## (C) 1997 Stephan Kulow
## Modified by Adriaan de Groot ## Modified by Adriaan de Groot

@ -1,4 +1,4 @@
INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes) INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
kde_module_LTLIBRARIES = conduit_address.la kde_module_LTLIBRARIES = conduit_address.la

@ -5,7 +5,7 @@
SUBDIRS = Icons SUBDIRS = Icons
INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes) INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -1,4 +1,4 @@
INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir) -I$(top_srcdir)/kpilot/lib $(all_includes) INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir) -I$(top_srcdir)/lib $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -3,7 +3,7 @@
### The mal conduit is Copyright (C) 2002 by Reinhold Kainhofer ### The mal conduit is Copyright (C) 2002 by Reinhold Kainhofer
INCLUDES= $(PISOCK_INCLUDE) $(MAL_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes) INCLUDES= $(PISOCK_INCLUDE) $(MAL_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)

@ -1,4 +1,4 @@
INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes) INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -1,4 +1,4 @@
INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes) INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -1,4 +1,4 @@
INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes) INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -1,7 +1,7 @@
### Makefile for the popmail conduit ### Makefile for the popmail conduit
### ###
INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes) INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)

@ -1,4 +1,4 @@
INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes) INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -2,7 +2,7 @@
### ###
### The sysinfo conduit is Copyright (C) 2003 by Reinhold Kainhofer ### The sysinfo conduit is Copyright (C) 2003 by Reinhold Kainhofer
INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes) INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)

@ -2,7 +2,7 @@
### ###
### The time conduit is Copyright (C) 2002 by Reinhold Kainhofer ### The time conduit is Copyright (C) 2002 by Reinhold Kainhofer
INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes) INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)

@ -3,7 +3,7 @@
### so it seems logical to put them in one place. ### so it seems logical to put them in one place.
### ###
INCLUDES= -I$(top_srcdir)/kpilot/lib -I$(top_srcdir) \ INCLUDES= -I$(top_srcdir)/lib -I$(top_srcdir) \
$(PISOCK_INCLUDE) $(all_includes) $(PISOCK_INCLUDE) $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -1,3 +1,34 @@
#MIN_CONFIG(3.3)
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_CHECK_HEADERS(fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h unistd.h values.h sys/limits.h err.h sys/cdefs.h)
AC_CHECK_SETENV
AC_CHECK_UNSETENV
KDE_NEED_FLEX
if test "$x_includes" != "NONE"; then
AC_DEFINE(HAVE_X11_HEADERS,1,Define if you have X11 header files)
fi
AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, [LIBXTST=-lXtst],, -lX11)
AC_SUBST(LIBXTST)
if test "$LIBXTST" != ""; then
AC_CHECK_HEADER([X11/extensions/XTest.h],
[AC_DEFINE(HAVE_XTEST, 1, [Define if you have X11 Xtest header files])])
fi
KDE_INIT_DOXYGEN([KDE PIM API Reference], [Version $VERSION])
KDE_CHECK_THREADING
dnl For apps that NEED threads
if test -z "$LIBPTHREAD" && test -z "$USE_THREADS"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE knode"
fi
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
dnl Configure.in.in for KPilot. dnl Configure.in.in for KPilot.
dnl dnl
dnl Copyright (C) 2000,2001 Adriaan de Groot dnl Copyright (C) 2000,2001 Adriaan de Groot

@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = kcm_kpilot.la
METASOURCES = AUTO METASOURCES = AUTO
INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes) INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
libconfiguration_la_SOURCES = kpilotConfig.cc kpilotSettings.kcfgc libconfiguration_la_SOURCES = kpilotConfig.cc kpilotSettings.kcfgc
libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries)

@ -29,7 +29,7 @@ libkpilot_la_SOURCES = kpilotlibSettings.kcfgc \
pilotTodoEntry.cc pilotTodoEntry.cc
libkpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) -no-undefined $(all_libraries) $(KDE_EXTRA_RPATH) $(KDE_RPATH) libkpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) -no-undefined $(all_libraries) $(KDE_EXTRA_RPATH) $(KDE_RPATH)
libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI) $(LIB_KABC) $(top_builddir)/libkcal/libkcal.la libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI) $(LIB_KABC) -lkcal
kpilotincludedir = $(includedir)/kpilot kpilotincludedir = $(includedir)/kpilot
kpilotinclude_HEADERS = \ kpilotinclude_HEADERS = \

Loading…
Cancel
Save