[ekg-commit] r2848 - in trunk: . src

[EKG commit list]

Author: porridge
Date: 2011-07-10 13:36:50 +0200 (Sun, 10 Jul 2011)
New Revision: 2848

Modified:
trunk/Makefile.in
trunk/src/Makefile.in
Log:
- obsluga osobnych katalogow budowania

Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2011-06-29 11:58:37 UTC (rev 2847)
+++ trunk/Makefile.in 2011-07-10 11:36:50 UTC (rev 2848)
@@ -1,5 +1,6 @@
# $Id$

+srcdir = @srcdir@
prefix = @prefix@
datarootdir = @datarootdir@
datadir = @datadir@
@@ -15,7 +16,7 @@

#

-all: configure @ekg@ @make_ekgwap@
+all: configure compat @ekg@ @make_ekgwap@

ekg:
cd src && $(MAKE) all
@@ -26,6 +27,9 @@
examples:
cd examples && $(MAKE) all

+compat:
+ mkdir -p $@
+
#

dep:
@@ -45,14 +49,14 @@

install-ekg-data:
$(INSTALL) -d $(DESTDIR)$(datadir)/ekg/themes
- $(INSTALL) -m 644 themes/*.theme $(DESTDIR)$(datadir)/ekg/themes
- $(INSTALL) -m 644 docs/vars.txt $(DESTDIR)$(datadir)/ekg
+ $(INSTALL) -m 644 $(srcdir)/themes/*.theme $(DESTDIR)$(datadir)/ekg/themes
+ $(INSTALL) -m 644 $(srcdir)/docs/vars.txt $(DESTDIR)$(datadir)/ekg

install-ekg-man:
$(INSTALL) -d $(DESTDIR)$(mandir)/man1
- $(INSTALL) -m 644 docs/ekg.man.en $(DESTDIR)$(mandir)/man1/ekg.1
+ $(INSTALL) -m 644 $(srcdir)/docs/ekg.man.en $(DESTDIR)$(mandir)/man1/ekg.1
$(INSTALL) -d $(DESTDIR)$(mandir)/pl/man1
- $(INSTALL) -m 644 docs/ekg.man.pl $(DESTDIR)$(mandir)/pl/man1/ekg.1
+ $(INSTALL) -m 644 $(srcdir)/docs/ekg.man.pl $(DESTDIR)$(mandir)/pl/man1/ekg.1

install-ekgwap:
$(INSTALL) -d $(DESTDIR)$(bindir)
@@ -60,12 +64,12 @@

install-ekl2:
$(INSTALL) -d $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 contrib/ekl2.pl $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 contrib/ekl2.sh $(DESTDIR)$(bindir)
+ $(INSTALL) -m 755 $(srcdir)/contrib/ekl2.pl $(DESTDIR)$(bindir)
+ $(INSTALL) -m 755 $(srcdir)/contrib/ekl2.sh $(DESTDIR)$(bindir)
$(INSTALL) -d $(DESTDIR)$(mandir)/man1
- $(INSTALL) -m 644 docs/ekl2.man.en $(DESTDIR)$(mandir)/man1/ekl2.1
+ $(INSTALL) -m 644 $(srcdir)/docs/ekl2.man.en $(DESTDIR)$(mandir)/man1/ekl2.1
$(INSTALL) -d $(DESTDIR)$(mandir)/pl/man1
- $(INSTALL) -m 644 docs/ekl2.man.pl $(DESTDIR)$(mandir)/pl/man1/ekl2.1
+ $(INSTALL) -m 644 $(srcdir)/docs/ekl2.man.pl $(DESTDIR)$(mandir)/pl/man1/ekl2.1

#


Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in 2011-06-29 11:58:37 UTC (rev 2847)
+++ trunk/src/Makefile.in 2011-07-10 11:36:50 UTC (rev 2848)
@@ -1,5 +1,6 @@
# $Id$

+srcdir= @srcdir@
prefix = @prefix@
datarootdir = @datarootdir@
datadir = @datadir@
@@ -10,7 +11,7 @@
sysconfdir = @sysconfdir@

CC = @CC@
-CFLAGS = -I.. @CFLAGS@ -DDATADIR=\"${datadir}/ekg\" -DSYSCONFDIR=\"${sysconfdir}\"
+CFLAGS = -I.. -I$(srcdir) -I$(srcdir)/.. @CFLAGS@ -DDATADIR=\"${datadir}/ekg\" -DSYSCONFDIR=\"${sysconfdir}\"
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@

@@ -20,18 +21,23 @@
STRIP = @STRIP@

OBJS = stuff.o commands.o events.o themes.o vars.o dynstuff.o userlist.o ekg.o xmalloc.o mail.o msgqueue.o emoticons.o configfile.o @OBJS@ ui-batch.o ui-none.o log.o
-SRCS = $(OBJS:.o=.c) comptime.c
+SRCS = $(patsubst %.o,$(srcdir)/%.c,$(OBJS)) $(srcdir)/comptime.c

+%.o: $(srcdir)/%.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+../compat/%.o: $(srcdir)/../compat/%.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
#

all: dep ekg @ioctld@

-ekg: $(OBJS) comptime.c
- $(CC) $(CFLAGS) -c -o comptime.o comptime.c
+ekg: $(OBJS) $(srcdir)/comptime.c
+ $(CC) $(CFLAGS) -c -o comptime.o $(srcdir)/comptime.c
$(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o $(LDFLAGS) $(LIBS)

-ioctld: ioctld.c
- $(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
+ioctld: $(srcdir)/ioctld.c
+ $(CC) $(CFLAGS) $< -o $@ $(LIBS) @IOCTLD_OBJS@

dep: .depend