Changeset 7a9d968 for Makefile

Timestamp:

2018-03-10T11:30:39Z (7 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (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:

Merge branch 'master' into HEAD

File:

• Makefile (modified) (3 diffs)

Makefile

@@ -94 +94 @@
         mkdir -p $(DESTDIR)$(SBINDIR)
         $(INSTALL) -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
+ifdef IMPLIB
+        # import library for cygwin
+        mkdir -p $(DESTDIR)$(LIBDIR)
+        $(INSTALL) -m 0644 $(IMPLIB) $(DESTDIR)$(LIBDIR)/$(IMPLIB)
+endif
 
 uninstall-bin:
         rm -f $(DESTDIR)$(SBINDIR)/$(OUTFILE)
+ifdef IMPLIB
+        rm -f $(DESTDIR)$(LIBDIR)/$(IMPLIB)
+endif
 
 install-dev:
@@ -163 +171 @@
 
 $(subdirs):
-        @$(MAKE) -C $@ $(MAKECMDGOALS)
+        $(MAKE) -C $@ $(MAKECMDGOALS)
 
 $(OTR_PI): %.so: $(_SRCDIR_)%.c
         @echo '*' Building plugin $@
-        @$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
+        $(VERBOSE) $(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
 
 $(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c
         @echo '*' Building plugin skype
-        @$(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
+        $(VERBOSE) $(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
 
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 $(objects): Makefile Makefile.settings config.h
@@ -181 +189 @@
 $(OUTFILE): $(objects) $(subdirs)
         @echo '*' Linking $(OUTFILE)
-        @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
-ifndef DEBUG
+        $(VERBOSE) $(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
+ifneq ($(firstword $(STRIP)), \#)
         @echo '*' Stripping $(OUTFILE)
-        @-$(STRIP) $(OUTFILE)
+        $(VERBOSE) -$(STRIP) $(OUTFILE)
 endif