Changes in Makefile [5155570:a0c6fc5]

File:

• Makefile (modified) (5 diffs)

Makefile

@@ -27 +27 @@
 subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
 
-all: $(OUTFILE) $(OTR_PI) $(SKYPE_PI) systemd
+all: $(OUTFILE) $(OTR_PI) systemd
         $(MAKE) -C doc
-ifdef SKYPE_PI
-        $(MAKE) -C protocols/skype doc
-endif
 
 uninstall: uninstall-bin uninstall-doc 
@@ -74 +71 @@
 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:
@@ -118 +109 @@
         install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
 endif
-ifdef SKYPE_PI
-        mkdir -p $(DESTDIR)$(PLUGINDIR)
-        install -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
-        mkdir -p $(DESTDIR)$(ETCDIR)/../skyped
-        install -m 0644 $(SRCDIR)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
-        install -m 0644 $(SRCDIR)protocols/skype/skyped.conf $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
-        install -m 0755 $(SRCDIR)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
-endif
 
 systemd:
@@ -156 +139 @@
 $(OTR_PI): %.so: $(SRCDIR)%.c
         @echo '*' Building plugin $@
-        @$(CC) $(CFLAGS) $(OTRFLAGS) -fPIC -shared $< -o $@
-
-$(SKYPE_PI): $(SRCDIR)protocols/skype/skype.c
-        @echo '*' Building plugin skype
-        @$(CC) $(CFLAGS) -fPIC -shared $< -o $@
+        @$(CC) $(CFLAGS) $(OTRFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@
 
 $(objects): %.o: $(SRCDIR)%.c
@@ -185 +164 @@
 
 -include .depend/*.d
+# DO NOT DELETE