Renamed "panel.h" to "Panel.h" to avoid conflicts with ncurses
This commit is contained in:
parent
f788f1f862
commit
f540bbef2e
2
Makefile
2
Makefile
|
@ -21,7 +21,7 @@ dist:
|
|||
$(RM) -r $(PACKAGE)-$(VERSION)
|
||||
$(LN) -s . $(PACKAGE)-$(VERSION)
|
||||
@$(TAR) $(PACKAGE)-$(VERSION).tar.gz \
|
||||
$(PACKAGE)-$(VERSION)/include/panel.h \
|
||||
$(PACKAGE)-$(VERSION)/include/Panel.h \
|
||||
$(PACKAGE)-$(VERSION)/include/Makefile \
|
||||
$(PACKAGE)-$(VERSION)/include/project.conf \
|
||||
$(PACKAGE)-$(VERSION)/src/panel.c \
|
||||
|
|
|
@ -15,9 +15,9 @@ distclean: clean
|
|||
|
||||
install: all
|
||||
$(MKDIR) $(DESTDIR)$(INCLUDEDIR)
|
||||
$(INSTALL) -m 0644 panel.h $(DESTDIR)$(INCLUDEDIR)/panel.h
|
||||
$(INSTALL) -m 0644 Panel.h $(DESTDIR)$(INCLUDEDIR)/Panel.h
|
||||
|
||||
uninstall:
|
||||
$(RM) $(DESTDIR)$(INCLUDEDIR)/panel.h
|
||||
$(RM) $(DESTDIR)$(INCLUDEDIR)/Panel.h
|
||||
|
||||
.PHONY: all clean distclean install uninstall
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
includes=panel.h
|
||||
includes=Panel.h
|
||||
dist=Makefile
|
||||
|
|
|
@ -27,7 +27,7 @@ panel_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
|
|||
panel: $(panel_OBJS)
|
||||
$(CC) -o panel $(panel_OBJS) $(panel_LDFLAGS)
|
||||
|
||||
panel.o: panel.c common.h ../include/panel.h
|
||||
panel.o: panel.c common.h ../include/Panel.h
|
||||
$(CC) $(panel_CFLAGS) -c panel.c
|
||||
|
||||
main.o: main.c common.h
|
||||
|
|
|
@ -88,34 +88,34 @@ tasks_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
|
|||
tasks.so: $(tasks_OBJS)
|
||||
$(LD) -o tasks.so $(tasks_OBJS)
|
||||
|
||||
battery.o: battery.c ../../include/panel.h
|
||||
battery.o: battery.c ../../include/Panel.h
|
||||
$(CC) $(battery_CFLAGS) -c battery.c
|
||||
|
||||
clock.o: clock.c ../../include/panel.h
|
||||
clock.o: clock.c ../../include/Panel.h
|
||||
$(CC) $(clock_CFLAGS) -c clock.c
|
||||
|
||||
cpu.o: cpu.c ../../include/panel.h
|
||||
cpu.o: cpu.c ../../include/Panel.h
|
||||
$(CC) $(cpu_CFLAGS) -c cpu.c
|
||||
|
||||
desktop.o: desktop.c ../../include/panel.h
|
||||
desktop.o: desktop.c ../../include/Panel.h
|
||||
$(CC) $(desktop_CFLAGS) -c desktop.c
|
||||
|
||||
lock.o: lock.c ../../include/panel.h
|
||||
lock.o: lock.c ../../include/Panel.h
|
||||
$(CC) $(lock_CFLAGS) -c lock.c
|
||||
|
||||
logout.o: logout.c ../../include/panel.h
|
||||
logout.o: logout.c ../../include/Panel.h
|
||||
$(CC) $(logout_CFLAGS) -c logout.c
|
||||
|
||||
main.o: main.c ../../include/panel.h
|
||||
main.o: main.c ../../include/Panel.h
|
||||
$(CC) $(main_CFLAGS) -c main.c
|
||||
|
||||
memory.o: memory.c ../../include/panel.h
|
||||
memory.o: memory.c ../../include/Panel.h
|
||||
$(CC) $(memory_CFLAGS) -c memory.c
|
||||
|
||||
pager.o: pager.c ../../include/panel.h
|
||||
pager.o: pager.c ../../include/Panel.h
|
||||
$(CC) $(pager_CFLAGS) -c pager.c
|
||||
|
||||
tasks.o: tasks.c ../../include/panel.h
|
||||
tasks.o: tasks.c ../../include/Panel.h
|
||||
$(CC) $(tasks_CFLAGS) -c tasks.c
|
||||
|
||||
clean:
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
# include <unistd.h>
|
||||
# include <paths.h>
|
||||
#endif
|
||||
#include "panel.h"
|
||||
#include "Panel.h"
|
||||
|
||||
|
||||
/* Battery */
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <errno.h>
|
||||
#include "panel.h"
|
||||
#include "Panel.h"
|
||||
|
||||
|
||||
/* Clock */
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#ifdef __NetBSD__
|
||||
# include <sys/sysctl.h>
|
||||
#endif
|
||||
#include "panel.h"
|
||||
#include "Panel.h"
|
||||
|
||||
|
||||
/* Cpu */
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include <string.h>
|
||||
#include <gdk/gdkx.h>
|
||||
#include <X11/X.h>
|
||||
#include "panel.h"
|
||||
#include "Panel.h"
|
||||
|
||||
|
||||
/* Desktop */
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
|
||||
|
||||
#include "panel.h"
|
||||
#include "Panel.h"
|
||||
|
||||
|
||||
/* Lock */
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
|
||||
|
||||
#include "panel.h"
|
||||
#include "Panel.h"
|
||||
|
||||
|
||||
/* Lock */
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <System.h>
|
||||
#include "panel.h"
|
||||
#include "Panel.h"
|
||||
|
||||
|
||||
/* Main */
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#ifdef __NetBSD__
|
||||
# include <sys/sysctl.h>
|
||||
#endif
|
||||
#include "panel.h"
|
||||
#include "Panel.h"
|
||||
|
||||
|
||||
/* Memory */
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include <string.h>
|
||||
#include <gdk/gdkx.h>
|
||||
#include <X11/Xatom.h>
|
||||
#include "panel.h"
|
||||
#include "Panel.h"
|
||||
|
||||
|
||||
/* Pager */
|
||||
|
|
|
@ -10,7 +10,7 @@ sources=battery.c
|
|||
install=$(LIBDIR)/Panel/applets
|
||||
|
||||
[battery.c]
|
||||
depends=../../include/panel.h
|
||||
depends=../../include/Panel.h
|
||||
|
||||
[clock]
|
||||
type=plugin
|
||||
|
@ -18,7 +18,7 @@ sources=clock.c
|
|||
install=$(LIBDIR)/Panel/applets
|
||||
|
||||
[clock.c]
|
||||
depends=../../include/panel.h
|
||||
depends=../../include/Panel.h
|
||||
|
||||
[cpu]
|
||||
type=plugin
|
||||
|
@ -26,7 +26,7 @@ sources=cpu.c
|
|||
install=$(LIBDIR)/Panel/applets
|
||||
|
||||
[cpu.c]
|
||||
depends=../../include/panel.h
|
||||
depends=../../include/Panel.h
|
||||
|
||||
[desktop]
|
||||
type=plugin
|
||||
|
@ -34,7 +34,7 @@ sources=desktop.c
|
|||
install=$(LIBDIR)/Panel/applets
|
||||
|
||||
[desktop.c]
|
||||
depends=../../include/panel.h
|
||||
depends=../../include/Panel.h
|
||||
|
||||
[lock]
|
||||
type=plugin
|
||||
|
@ -42,7 +42,7 @@ sources=lock.c
|
|||
install=$(LIBDIR)/Panel/applets
|
||||
|
||||
[lock.c]
|
||||
depends=../../include/panel.h
|
||||
depends=../../include/Panel.h
|
||||
|
||||
[logout]
|
||||
type=plugin
|
||||
|
@ -50,7 +50,7 @@ sources=logout.c
|
|||
install=$(LIBDIR)/Panel/applets
|
||||
|
||||
[logout.c]
|
||||
depends=../../include/panel.h
|
||||
depends=../../include/Panel.h
|
||||
|
||||
[main]
|
||||
type=plugin
|
||||
|
@ -59,7 +59,7 @@ cppflags=-D PREFIX=\"$(PREFIX)\"
|
|||
install=$(LIBDIR)/Panel/applets
|
||||
|
||||
[main.c]
|
||||
depends=../../include/panel.h
|
||||
depends=../../include/Panel.h
|
||||
|
||||
[memory]
|
||||
type=plugin
|
||||
|
@ -67,7 +67,7 @@ sources=memory.c
|
|||
install=$(LIBDIR)/Panel/applets
|
||||
|
||||
[memory.c]
|
||||
depends=../../include/panel.h
|
||||
depends=../../include/Panel.h
|
||||
|
||||
[pager]
|
||||
type=plugin
|
||||
|
@ -75,7 +75,7 @@ sources=pager.c
|
|||
install=$(LIBDIR)/Panel/applets
|
||||
|
||||
[pager.c]
|
||||
depends=../../include/panel.h
|
||||
depends=../../include/Panel.h
|
||||
|
||||
[tasks]
|
||||
type=plugin
|
||||
|
@ -83,4 +83,4 @@ sources=tasks.c
|
|||
install=$(LIBDIR)/Panel/applets
|
||||
|
||||
[tasks.c]
|
||||
depends=../../include/panel.h
|
||||
depends=../../include/Panel.h
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <errno.h>
|
||||
#include <gdk/gdkx.h>
|
||||
#include <X11/Xatom.h>
|
||||
#include "panel.h"
|
||||
#include "Panel.h"
|
||||
|
||||
|
||||
/* Tasks */
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include "panel.h"
|
||||
#include "Panel.h"
|
||||
#include "common.h"
|
||||
#include "../config.h"
|
||||
|
||||
|
|
|
@ -16,4 +16,4 @@ install=$(BINDIR)
|
|||
depends=common.h
|
||||
|
||||
[panel.c]
|
||||
depends=common.h,../include/panel.h
|
||||
depends=common.h,../include/Panel.h
|
||||
|
|
Loading…
Reference in New Issue
Block a user