Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-13 19:22:58 +00:00
Code Issues Releases Activity

remove bogus cairo junk

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@737 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Philip Kovacs 2006-11-08 00:36:21 +00:00
parent 88024b07ce
commit 2d4ba18b27
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -69,7 +69,7 @@ conky_SOURCES = \
$(x11) \
$(xmms2)
AM_LDFLAGS = $(CAIRO_LIBS) $(PTHREAD_LIBS) -lm
AM_LDFLAGS = $(PTHREAD_LIBS) -lm
EXTRA_DIST = \
audacious.c \

15
src/conky.h
View File

@ -28,16 +28,6 @@
#include <kvm.h>
#endif /* __FreeBSD__ */
#ifdef X11
#if defined(HAVE_CAIRO_H) && defined(HAVE_CAIRO_XLIB_H) && defined(WANT_CAIRO)
#define CAIRO
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <cairo.h>
#include <cairo-xlib.h>
#endif
#endif /* X11 */
#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
#include <machine/apm_bios.h>
#endif /* __FreeBSD__ */
@ -553,11 +543,6 @@ char *get_hddtemp_info(char *dev, char *addr, int port, char *unit);
/* in linux.c */
/* nothing to see here */
/* in cairo.c */
extern int do_it(void);
#endif