philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix aim and nap plugin Makefiles so that they build compat.o in the right

Browse Source 
place when building out-of-tree.  Reported by nyet.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@166 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2012-05-08 15:20:39 +00:00
parent b55825ab99
commit 3bbe082f16
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@@ -1,5 +1,7 @@
[Changes 1.2c01] [Changes 1.2c01]
* Fix plugin Makefiles for out-of-tree building, reported by nyet. (caf)
* Add DESTDIR support to build system, to ease rpm and deb packaging. * Add DESTDIR support to build system, to ease rpm and deb packaging.
Reported separately by nyet and VICODAN. (caf) Reported separately by nyet and VICODAN. (caf)

2
dll/aim/Makefile.in
View File

@@ -170,7 +170,7 @@ Makefile: Makefile.in
compat.o: $(top_srcdir)/source/compat.c compat.o: $(top_srcdir)/source/compat.c
$(CC) $(AIMDEFS) $(SHLIB_CFLAGS) $(CFLAGS) \ $(CC) $(AIMDEFS) $(SHLIB_CFLAGS) $(CFLAGS) \
-c $(top_srcdir)/source/compat.c -o $(srcdir)/compat.o -c $(top_srcdir)/source/compat.c
toc.o: $(srcdir)/toc.c toc.o: $(srcdir)/toc.c
$(CC) $(AIMDEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/toc.c $(CC) $(AIMDEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/toc.c

2
dll/nap/Makefile.in
View File

@@ -168,7 +168,7 @@ Makefile: Makefile.in
compat.o: $(top_srcdir)/source/compat.c compat.o: $(top_srcdir)/source/compat.c
$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) \ $(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) \
-c $(top_srcdir)/source/compat.c -o $(srcdir)/compat.o -c $(top_srcdir)/source/compat.c
nap.o: $(srcdir)/nap.c nap.o: $(srcdir)/nap.c
$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/nap.c $(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/nap.c