New library wmgeneral

This patch includes the library wmgeneral. The wmgeneral library
is used in a lot of dockapps:

$ find . -name wmgeneral
./wmkeys/wmgeneral
./wmtime/wmgeneral
./wmtz/wmgeneral
./wmsm.app/wmgeneral
./wmcpufreq/wmgeneral
./wmtv/src/wmgeneral
./wmSMPmon/wmgeneral
./wmckgmail/wmgeneral
./wmifs/wmgeneral
./wmbiff/wmgeneral
./wmfsm/wmgeneral
./wmsun/wmgeneral
./wmmon/wmgeneral
./wmitime/wmgeneral
./wmppp.app/wmgeneral

So, any change in the wmgeneral needs change a lot of dockapps.

I used the wmmon dockapp to move the wmgeneral and then I adjust the
wmmon to use the library. The library must be installed in the system
to build wmmon (wmmon uses the .h files) and is needed to run wmmon
(wmmon uses the libwmgeneral.so shared library).

I did not include any Changelog/README/... file to announce the change
in the libwmgeneral folder.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
This commit is contained in:
Rodolfo García Peñas (kix) 2015-08-13 17:42:41 +02:00 committed by Carlos R. Mafra
parent 78109f686c
commit 9b5756d5bd
9 changed files with 42 additions and 9 deletions

37
libwmgeneral/Makefile Normal file
View file

@ -0,0 +1,37 @@
PREFIX = /usr/local
DESTDIR = $(PREFIX)/lib
INCDIR = $(PREFIX)/include/wmgeneral
LIBDIR = -L/usr/X11R6/lib
LIBS = -lXpm -lXext -lX11
TARGET = libwmgeneral.so
OBJECTS = wmgeneral.o \
misc.o \
list.o
HEADERS = wmgeneral.h \
list.h \
misc.h
INSTALL = install
INSTALL_LIB = $(INSTALL)
CFLAGS = -O2 -c -Wall -Werror -fpic
LDFLAGS = -shared
CC = cc
.c.o::
$(CC) $(CFLAGS) $< -o $*.o
$(TARGET):: $(OBJECTS)
$(CC) $(LDFLAGS) -o $(TARGET) $(OBJECTS)
clean::
for i in $(OBJECTS) ; do \
rm -f $$i;\
done
rm -f $(TARGET)
install:: $(TARGET)
$(INSTALL) -d $(DESTDIR)
$(INSTALL) -m 644 $(TARGET) $(DESTDIR)
$(INSTALL) -d $(INCDIR)
$(INSTALL) -m 644 $(HEADERS) $(INCDIR)

10
wmmon/wmmon/Makefile Executable file → Normal file
View file

@ -1,14 +1,10 @@
LIBDIR = -L/usr/X11R6/lib
LIBS = -lXpm -lXext -lX11
OBJS = wmmon.o \
../wmgeneral/wmgeneral.o \
../wmgeneral/misc.o \
../wmgeneral/list.o
LIBDIR = -L/usr/X11R6/lib -L/usr/local/lib
LIBS = -lXpm -lXext -lX11 -lwmgeneral
OBJS = wmmon.o
CFLAGS = -O2
CC = cc
.c.o:
$(CC) $(CFLAGS) -c -Wall $< -o $*.o

View file

@ -108,8 +108,8 @@
#include <X11/xpm.h>
#include <X11/extensions/shape.h>
#include "../wmgeneral/wmgeneral.h"
#include "../wmgeneral/misc.h"
#include <wmgeneral/wmgeneral.h>
#include <wmgeneral/misc.h>
#include "wmmon-master.xpm"
#include "wmmon-mask.xbm"