Applied Bjorn Andersson's autoconf/automake patch. LCDproc is now built
with the standard "./autogen.sh && ./configure && make && make install" instead of just tweaking the Makefile and typing "make".
This commit is contained in:
William Ferrell
@@ -1,52 +0,0 @@
|
||||
include ../Makefile.config
|
||||
|
||||
########################################################################
|
||||
# You shouldn't need to touch anything below here.
|
||||
########################################################################
|
||||
|
||||
TARGET = LCDd
|
||||
DIRS = drivers
|
||||
OBJ += sock.o clients.o parse.o client_functions.o client_data.o screen.o \
|
||||
widget.o screenlist.o render.o serverscreens.o main.o input.o \
|
||||
menu.o menus.o
|
||||
LIB += drivers/libLCDdrivers.a ../shared/libLCDstuff.a
|
||||
|
||||
ifeq ($(IRMAN),1)
|
||||
LIB += ../../libirman-0.4.1b/libirman.a
|
||||
endif
|
||||
|
||||
|
||||
include ../Makefile.config
|
||||
|
||||
###################################################################
|
||||
# Compilation...
|
||||
#
|
||||
#all: $(OBJ)
|
||||
all: $(TARGET)
|
||||
|
||||
$(TARGET): $(OBJ) $(LIB) Makefile
|
||||
$(GCC) -s $(MISC) -o $(TARGET) $(OBJ) $(LIB)
|
||||
|
||||
%.o: %.c %.h Makefile
|
||||
$(GCC) -c $(MISC) $<
|
||||
|
||||
|
||||
##################################################################
|
||||
# Installation
|
||||
#
|
||||
install: $(TARGET)
|
||||
@echo Installing LCD Server...
|
||||
install -m 0755 -o root -g root $(TARGET) /usr/local/bin/
|
||||
|
||||
|
||||
##################################################################
|
||||
# Other stuff...
|
||||
#
|
||||
clean:
|
||||
@for i in $(DIRS); do \
|
||||
(cd $$i; [ -f Makefile ] && $(MAKE) $@) \
|
||||
done
|
||||
rm -f $(OBJ) $(TARGET) *~ core
|
||||
|
||||
edit:
|
||||
emacs . &
|
||||
@@ -1,45 +0,0 @@
|
||||
########################################################################
|
||||
# You shouldn't need to touch anything below here.
|
||||
########################################################################
|
||||
include ../../Makefile.config
|
||||
|
||||
TARGET = libLCDdrivers.a
|
||||
OBJ += lcd.o drv_base.o $(DOBJ)
|
||||
SOURCES = Makefile lcd.c lcd.h \
|
||||
MtxOrb.c MtxOrb.h wirz-sli.c wirz-sli.h text.c text.h \
|
||||
curses_drv.c curses_drv.h drv_base.c drv_base.h \
|
||||
hd44780.c hd44780.h port.h joy.c joy.h irman.c irman.h \
|
||||
CFontz.c CFontz.h
|
||||
INCLUDE = -I../../shared
|
||||
|
||||
|
||||
###################################################################
|
||||
# Compilation...
|
||||
#
|
||||
all: $(TARGET)
|
||||
|
||||
|
||||
$(TARGET): $(OBJ) Makefile
|
||||
$(AR) rcs $(TARGET) $(OBJ)
|
||||
#$(TARGET): $(OBJ) Makefile
|
||||
# $(GCC) -s $(MISC) $(INCLUDE) -o $(TARGET) $(OBJ) $(LIB)
|
||||
|
||||
%.o: %.c %.h Makefile
|
||||
$(GCC) -c $(MISC) $(INCLUDE) $<
|
||||
|
||||
|
||||
##################################################################
|
||||
# Other stuff...
|
||||
#
|
||||
clean:
|
||||
rm -f $(OBJ) *.o $(DOBJ) $(TARGET) *~ core
|
||||
|
||||
edit:
|
||||
nedit $(SOURCES) $(EXTRAS) &
|
||||
|
||||
todo:
|
||||
@echo ---------------===========================================
|
||||
@grep TODO $(SOURCES) | grep -v SOURCES
|
||||
@grep FIXME $(SOURCES) | grep -v SOURCES
|
||||
@echo ---------------===========================================
|
||||
|
||||
@@ -989,59 +989,3 @@ void MtxOrb_init_all(int type)
|
||||
{
|
||||
}
|
||||
|
||||
// TODO: Remove this code wich was use for developpement.
|
||||
// PS: That was the code to define unidirectionnal [h|v]bar.
|
||||
/*
|
||||
if(type==hbar){
|
||||
if(custom!=hbar) {
|
||||
MtxOrb_set_known_char(1, barr1);
|
||||
MtxOrb_set_known_char(2, barr2);
|
||||
MtxOrb_set_known_char(3, barr3);
|
||||
MtxOrb_set_known_char(4, barr4);
|
||||
custom=hbar;
|
||||
}
|
||||
}
|
||||
|
||||
if(type==vbar){
|
||||
if(custom!=vbar) {
|
||||
MtxOrb_set_known_char(1, baru1);
|
||||
MtxOrb_set_known_char(2, baru2);
|
||||
MtxOrb_set_known_char(3, baru3);
|
||||
MtxOrb_set_known_char(4, baru4);
|
||||
MtxOrb_set_known_char(5, baru5);
|
||||
MtxOrb_set_known_char(6, baru6);
|
||||
MtxOrb_set_known_char(7, baru7);
|
||||
custom=vbar;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
// TODO: Remove this code wich was use for developpement.
|
||||
// PS: It was a good idea, but not working (fixing take to much time).
|
||||
/*
|
||||
void MtxOrb_icon(int which, char dest)
|
||||
{
|
||||
if(custom==bign) custom=beat;
|
||||
MtxOrb_set_known_char(dest, which+21);
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
// TODO: Remove this code wich was use for developpement.
|
||||
// PS: Temporary code used durring developpement of dynamic bar.
|
||||
/*
|
||||
if(type==barr1)return(1);
|
||||
if(type==barr2)return(2);
|
||||
if(type==barr3)return(3);
|
||||
if(type==barr4)return(4);
|
||||
if(type==baru1)return(1);
|
||||
if(type==baru2)return(2);
|
||||
if(type==baru3)return(3);
|
||||
if(type==baru4)return(4);
|
||||
if(type==baru5)return(5);
|
||||
if(type==baru6)return(6);
|
||||
if(type==baru7)return(7);
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <string.h>
|
||||
#include <sys/errno.h>
|
||||
|
||||
#include "../lcd.h"
|
||||
#include "lcd.h"
|
||||
#include "debug.h"
|
||||
|
||||
|
||||
|
||||
@@ -6,7 +6,11 @@
|
||||
#include <string.h>
|
||||
#include <sys/errno.h>
|
||||
|
||||
#include "LL.h"
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "../../shared/LL.h"
|
||||
|
||||
#include "lcd.h"
|
||||
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
#ifndef MAIN_H
|
||||
#define MAIN_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
/*
|
||||
contains a few things that other parts of the program might want
|
||||
to know about...
|
||||
|
||||
@@ -3,6 +3,10 @@
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "../shared/debug.h"
|
||||
|
||||
#include "drivers/lcd.h"
|
||||
|
||||
Reference in New Issue
Block a user