Changeset 6e9ae72 for Makefile

Timestamp:

2011-12-17T13:50:01Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline merge.

File:

• Makefile (modified) (5 diffs)

Makefile

@@ -27 +27 @@
 subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
 
-all: $(OUTFILE) $(OTR_PI) systemd
+all: $(OUTFILE) $(OTR_PI) $(SKYPE_PI) systemd
         $(MAKE) -C doc
+ifdef SKYPE_PI
+        $(MAKE) -C protocols/skype doc
+endif
 
 uninstall: uninstall-bin uninstall-doc 
@@ -71 +74 @@
 install-doc:
         $(MAKE) -C doc install
+ifdef SKYPE_PI
+        $(MAKE) -C protocols/skype install-doc
+endif
 
 uninstall-doc:
         $(MAKE) -C doc uninstall
+ifdef SKYPE_PI
+        $(MAKE) -C protocols/skype uninstall-doc
+endif
 
 install-bin:
-        mkdir -p $(DESTDIR)$(BINDIR)
-        install -m 0755 $(OUTFILE) $(DESTDIR)$(BINDIR)/$(OUTFILE)
+        mkdir -p $(DESTDIR)$(SBINDIR)
+        install -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
 
 uninstall-bin:
-        rm -f $(DESTDIR)$(BINDIR)/$(OUTFILE)
+        rm -f $(DESTDIR)$(SBINDIR)/$(OUTFILE)
 
 install-dev:
@@ -104 +113 @@
         -rmdir $(DESTDIR)$(ETCDIR)
 
-install-plugins:
+install-plugins: install-plugin-otr install-plugin-skype
+
+install-plugin-otr:
 ifdef OTR_PI
         mkdir -p $(DESTDIR)$(PLUGINDIR)
         install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
+endif
+
+install-plugin-skype:
+ifdef SKYPE_PI
+        mkdir -p $(DESTDIR)$(PLUGINDIR)
+        install -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
+        mkdir -p $(DESTDIR)$(ETCDIR)/../skyped $(DESTDIR)$(BINDIR)
+        install -m 0644 $(SRCDIR)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
+        install -m 0644 $(SRCDIR)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
+        install -m 0755 $(SRCDIR)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
+        make -C protocols/skype install-doc
 endif
 
@@ -139 +161 @@
 $(OTR_PI): %.so: $(SRCDIR)%.c
         @echo '*' Building plugin $@
-        @$(CC) $(CFLAGS) $(OTRFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@
+        @$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
+
+$(SKYPE_PI): $(SRCDIR)protocols/skype/skype.c
+        @echo '*' Building plugin skype
+        @$(CC) $(CFLAGS) -fPIC -shared $< -o $@
 
 $(objects): %.o: $(SRCDIR)%.c
@@ -164 +190 @@
 
 -include .depend/*.d
+# DO NOT DELETE