Build script fix to allow plugins to build on x86-64.

$(SHLIB_CFLAGS) is required on the compile line, not just the link line. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@99 13b04d17-f746-0410-82c6-800466cd88b0
2010-09-09 01:08:14 +00:00
parent f71e26acc7
commit 2f92982eac
25 changed files with 48 additions and 46 deletions
--- a/2
+++ b/2
@@ -1,5 +1,7 @@
 [Changes 1.2c01]

+* Build script fix to allow plugins to build on x86-64. (caf)
+
 * Correct count in /CLONES (reported by t3gah), and format output nicely
  using an /fset. (caf)

--- a/dll/Makefile.in
+++ b/dll/Makefile.in
@@ -166,7 +166,7 @@ ALL_PLUGINS = abot acro aim amp arcfour autocycle blowfish cavlink cdrom encrypt
 PLUGINS = @PLUGINS@

 .c.o:
-	$(CC) $(DEFS) $(CFLAGS) -c $<
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $<

 $(SHLIB_SUFFIX).o:
 	$(SHLIB_LD) $(SHLIB_CFLAGS) $< -o $@$(SHLIB_SUFFIX)
@@ -191,7 +191,7 @@ dummy:
 dllinit.o:
 	@( \
 		if test x"$(PLUGINS)" != x""; then \
-			$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/dllinit.c; \
+			$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/dllinit.c; \
 		fi; \
 	)

--- a/dll/abot/Makefile.in
+++ b/dll/abot/Makefile.in
@@ -165,7 +165,7 @@ Makefile: Makefile.in
 	  && ./config.status

 autobot.o: $(srcdir)/autobot.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/autobot.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/autobot.c

 autobot$(SHLIB_SUFFIX): autobot.o ../dllinit.o
 	$(SHLIB_LD) autobot.o ../dllinit.o $(SHLIB_CFLAGS) -o autobot$(SHLIB_SUFFIX)
--- a/dll/acro/Makefile.in
+++ b/dll/acro/Makefile.in
@@ -165,7 +165,7 @@ Makefile: Makefile.in
 	  && ./config.status

 acro.o: $(srcdir)/acro.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/acro.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/acro.c

 acro$(SHLIB_SUFFIX): acro.o ../dllinit.o
 	$(SHLIB_LD) acro.o ../dllinit.o $(SHLIB_CFLAGS) -o acro$(SHLIB_SUFFIX)
--- a/dll/aim/Makefile.in
+++ b/dll/aim/Makefile.in
@@ -160,7 +160,7 @@ AIMDEFS = $(DEFS) -I$(srcdir)/toc

 PLUGIN_NAME = aim

-OBJS = toc.o util.o cmd.o aim.o $(topdir)/source/compat.o
+OBJS = toc.o util.o cmd.o aim.o compat.o

 all: Makefile toc aim$(SHLIB_SUFFIX)

@@ -168,21 +168,21 @@ Makefile: Makefile.in
 	cd $(topdir) \
 	  && ./config.status

-$(topdir)/source/compat.o: $(top_srcdir)/source/compat.c
-	$(CC) $(AIMDEFS) $(CFLAGS) \
-		-c $(top_srcdir)/source/compat.c -o $(topdir)/source/compat.o
+compat.o: $(top_srcdir)/source/compat.c
+	$(CC) $(AIMDEFS) $(SHLIB_CFLAGS) $(CFLAGS) \
+		-c $(top_srcdir)/source/compat.c -o $(srcdir)/compat.o

 toc.o: $(srcdir)/toc.c
-	$(CC) $(AIMDEFS) $(CFLAGS) -c $(srcdir)/toc.c
+	$(CC) $(AIMDEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/toc.c

 util.o: $(srcdir)/util.c
-	$(CC) $(AIMDEFS) $(CFLAGS) -c $(srcdir)/util.c
+	$(CC) $(AIMDEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/util.c

 cmd.o: $(srcdir)/cmd.c
-	$(CC) $(AIMDEFS) $(CFLAGS) -c $(srcdir)/cmd.c
+	$(CC) $(AIMDEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/cmd.c

 aim.o: $(srcdir)/aim.c
-	$(CC) $(AIMDEFS) $(CFLAGS) -c $(srcdir)/aim.c
+	$(CC) $(AIMDEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/aim.c

 aim$(SHLIB_SUFFIX): $(OBJS) 
 	$(SHLIB_LD) $(OBJS) $(SHLIB_CFLAGS) -o aim$(SHLIB_SUFFIX) -Ltoc -ltoc
--- a/dll/aim/toc/Makefile.in
+++ b/dll/aim/toc/Makefile.in
@@ -159,7 +159,7 @@ MFLAGS = \
 #DEBUG_CFLAGS = -g -DDEBUG_LIB_TOC

 .c.o:
-	$(CC) $(DEFS) $(CFLAGS) $(DEBUG_CFLAGS)  -c $<
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) $(DEBUG_CFLAGS)  -c $<

 LOBJS = toc.o network.o util.o server.o interface.o buddy.o ll.o misc.o

--- a/dll/amp/Makefile.in
+++ b/dll/amp/Makefile.in
@@ -177,7 +177,7 @@ distclean: clean
 	$(RM) *~ config.status config.cache config.log config.h Makefile

 ../dllinit.o:
-	$(CC) -DOS_$(OS) $(DEFS) $(CFLAGS) -o ../dllinit.o -c ../dllinit.c
+	$(CC) -DOS_$(OS) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -o ../dllinit.o -c ../dllinit.c

 amp$(SHLIB_SUFFIX): $(OBJ) ../dllinit.o
 	$(SHLIB_LD) -o amp$(SHLIB_SUFFIX) $(OBJ) ../dllinit.o
@@ -187,7 +187,7 @@ SOURCES = $(OBJECTS:%.o=$(srcdir)/%.c)
 OS := $(shell uname -s) 

 .c.o:
-	$(CC) -DOS_$(OS) $(DEFS) $(CFLAGS) -c $<
+	$(CC) -DOS_$(OS) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $<

 depend:
 	gcc -MM $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c > .depend
--- a/dll/arcfour/Makefile.in
+++ b/dll/arcfour/Makefile.in
@@ -165,10 +165,10 @@ Makefile: Makefile.in
 	  && ./config.status

 arcfour.o: $(srcdir)/arcfour.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/arcfour.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/arcfour.c

 md5.o: $(srcdir)/md5.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/md5.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/md5.c

 arcfour$(SHLIB_SUFFIX): arcfour.o md5.o ../dllinit.o
 	$(SHLIB_LD) arcfour.o md5.o ../dllinit.o $(SHLIB_CFLAGS) -o arcfour$(SHLIB_SUFFIX)
--- a/dll/autocycle/Makefile.in
+++ b/dll/autocycle/Makefile.in
@@ -168,7 +168,7 @@ Makefile: Makefile.in
 	  && ./config.status

 autocycle.o: $(srcdir)/autocycle.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/autocycle.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/autocycle.c

 autocycle$(SHLIB_SUFFIX): autocycle.o ../dllinit.o
 	$(SHLIB_LD) autocycle.o ../dllinit.o $(SHLIB_CFLAGS) -o autocycle$(SHLIB_SUFFIX)
--- a/dll/blowfish/Makefile.in
+++ b/dll/blowfish/Makefile.in
@@ -165,7 +165,7 @@ Makefile: Makefile.in
 	  && ./config.status

 blowfish.o: $(srcdir)/blowfish.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/blowfish.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/blowfish.c

 blowfish$(SHLIB_SUFFIX): blowfish.o ../dllinit.o
 	$(SHLIB_LD) blowfish.o ../dllinit.o $(SHLIB_CFLAGS) -o blowfish$(SHLIB_SUFFIX) $(TCL_LIBS)
--- a/dll/cavlink/Makefile.in
+++ b/dll/cavlink/Makefile.in
@@ -165,7 +165,7 @@ Makefile: Makefile.in
 	  && ./config.status

 cavlink.o: $(srcdir)/cavlink.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/cavlink.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/cavlink.c

 cavlink$(SHLIB_SUFFIX): cavlink.o ../dllinit.o
 	$(SHLIB_LD) cavlink.o ../dllinit.o ${SHLIB_CFLAGS} -o cavlink$(SHLIB_SUFFIX)
--- a/dll/cdrom/Makefile.in
+++ b/dll/cdrom/Makefile.in
@@ -165,7 +165,7 @@ Makefile: Makefile.in
 	  && ./config.status

 cdrom.o: $(srcdir)/cdrom.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/cdrom.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/cdrom.c

 cdrom$(SHLIB_SUFFIX): cdrom.o ../dllinit.o
 	$(SHLIB_LD) cdrom.o ../dllinit.o ${SHLIB_CFLAGS} -o cdrom$(SHLIB_SUFFIX)
--- a/dll/encrypt/Makefile.in
+++ b/dll/encrypt/Makefile.in
@@ -165,7 +165,7 @@ Makefile: Makefile.in
 	  && ./config.status

 encrypt.o: $(srcdir)/encrypt.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/encrypt.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/encrypt.c

 encrypt$(SHLIB_SUFFIX): encrypt.o ../dllinit.o
 	$(SHLIB_LD) encrypt.o ../dllinit.o ${SHLIB_CFLAGS} -o encrypt$(SHLIB_SUFFIX)
--- a/dll/europa/Makefile.in
+++ b/dll/europa/Makefile.in
@@ -170,7 +170,7 @@ Makefile: Makefile.in
 	  && ./config.status

 europa.o: $(srcdir)/europa.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/europa.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/europa.c

 europa$(SHLIB_SUFFIX): europa.o ../dllinit.o
 	$(SHLIB_LD) europa.o ../dllinit.o $(SHLIB_CFLAGS) -o europa$(SHLIB_SUFFIX) $(MYSQL_LIBS)
--- a/dll/fserv/Makefile.in
+++ b/dll/fserv/Makefile.in
@@ -165,7 +165,7 @@ Makefile: Makefile.in
 	  && ./config.status

 fserv.o: $(srcdir)/fserv.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/fserv.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/fserv.c

 fserv$(SHLIB_SUFFIX): fserv.o ../dllinit.o
 	$(SHLIB_LD) fserv.o ../dllinit.o $(SHLIB_CFLAGS) -o fserv$(SHLIB_SUFFIX)
--- a/dll/hint/Makefile.in
+++ b/dll/hint/Makefile.in
@@ -165,7 +165,7 @@ Makefile: Makefile.in
 	  && ./config.status

 hint.o: $(srcdir)/hint.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/hint.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/hint.c

 hint$(SHLIB_SUFFIX): hint.o ../dllinit.o
 	$(SHLIB_LD) hint.o ../dllinit.o $(SHLIB_CFLAGS) -o hint$(SHLIB_SUFFIX)
--- a/dll/identd/Makefile.in
+++ b/dll/identd/Makefile.in
@@ -165,7 +165,7 @@ Makefile: Makefile.in
 	  && ./config.status

 identd.o: $(srcdir)/identd.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/identd.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/identd.c

 identd$(SHLIB_SUFFIX): identd.o ../dllinit.o
 	$(SHLIB_LD) identd.o ../dllinit.o $(SHLIB_CFLAGS) -o identd$(SHLIB_SUFFIX)
--- a/dll/nap/Makefile.in
+++ b/dll/nap/Makefile.in
@@ -158,7 +158,7 @@ MFLAGS = \

 PLUGIN_NAME = nap

-OBJS = nap.o napsend.o nap_file.o napfunc.o napother.o md5.o $(topdir)/source/compat.o
+OBJS = nap.o napsend.o nap_file.o napfunc.o napother.o md5.o compat.o

 all: Makefile nap$(SHLIB_SUFFIX)

@@ -166,27 +166,27 @@ Makefile: Makefile.in
 	cd $(topdir) \
 	  && ./config.status

-$(topdir)/source/compat.o: $(top_srcdir)/source/compat.c
-	$(CC) $(DEFS) $(CFLAGS) \
-		-c $(top_srcdir)/source/compat.c -o $(topdir)/source/compat.o
+compat.o: $(top_srcdir)/source/compat.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) \
+		-c $(top_srcdir)/source/compat.c -o $(srcdir)/compat.o

 nap.o: $(srcdir)/nap.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/nap.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/nap.c

 napsend.o: $(srcdir)/napsend.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/napsend.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/napsend.c

 nap_file.o: $(srcdir)/nap_file.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/nap_file.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/nap_file.c

 napfunc.o: $(srcdir)/napfunc.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/napfunc.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/napfunc.c

 napother.o: $(srcdir)/napother.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/napother.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/napother.c

 md5.o: $(srcdir)/md5.c $(srcdir)/md5.h
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/md5.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/md5.c

 nap$(SHLIB_SUFFIX): $(OBJS) 
 	$(SHLIB_LD) $(OBJS) $(SHLIB_CFLAGS) -o nap$(SHLIB_SUFFIX)
--- a/dll/nicklist/Makefile.in
+++ b/dll/nicklist/Makefile.in
@@ -168,7 +168,7 @@ Makefile: Makefile.in
 	  && ./config.status

 nicklist.o: $(srcdir)/nicklist.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/nicklist.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/nicklist.c

 nicklist$(SHLIB_SUFFIX): nicklist.o ../dllinit.o
 	$(SHLIB_LD) nicklist.o ../dllinit.o $(SHLIB_CFLAGS) -o nicklist$(SHLIB_SUFFIX)
--- a/dll/pkga/Makefile.in
+++ b/dll/pkga/Makefile.in
@@ -165,7 +165,7 @@ Makefile: Makefile.in
 	  && ./config.status

 pkga.o: $(srcdir)/pkga.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/pkga.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/pkga.c

 pkga$(SHLIB_SUFFIX): pkga.o ../dllinit.o
 	$(SHLIB_LD) pkga.o ../dllinit.o $(SHLIB_CFLAGS) -o pkga$(SHLIB_SUFFIX)
--- a/dll/possum/Makefile.in
+++ b/dll/possum/Makefile.in
@@ -165,13 +165,13 @@ Makefile: Makefile.in
 	  && ./config.status

 possum.o: $(srcdir)/possum.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/possum.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/possum.c

 head.o: $(srcdir)/head.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/head.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/head.c

 llist.o: $(srcdir)/llist.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/llist.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/llist.c

 possum$(SHLIB_SUFFIX): possum.o head.o llist.o ../dllinit.o
 	$(SHLIB_LD) possum.o llist.o head.o ../dllinit.o $(SHLIB_CFLAGS) -o possum$(SHLIB_SUFFIX)
--- a/dll/qbx/Makefile.in
+++ b/dll/qbx/Makefile.in
@@ -164,7 +164,7 @@ Makefile: Makefile.in
 	  && ./config.status

 qbx.o: $(srcdir)/qbx.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/qbx.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/qbx.c

 qbx$(SHLIB_SUFFIX): qbx.o ../dllinit.o
 	$(SHLIB_LD) qbx.o ../dllinit.o $(SHLIB_CFLAGS) -o qbx$(SHLIB_SUFFIX)
--- a/dll/qmail/Makefile.in
+++ b/dll/qmail/Makefile.in
@@ -165,7 +165,7 @@ Makefile: Makefile.in
 	  && ./config.status

 qmail.o: $(srcdir)/qmail.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/qmail.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/qmail.c

 qmail$(SHLIB_SUFFIX): qmail.o ../dllinit.o
 	$(SHLIB_LD) qmail.o ../dllinit.o $(SHLIB_CFLAGS) -o qmail$(SHLIB_SUFFIX)
--- a/dll/wavplay/Makefile.in
+++ b/dll/wavplay/Makefile.in
@@ -165,7 +165,7 @@ Makefile: Makefile.in
 	  && ./config.status

 wavplay.o: $(srcdir)/wavplay.c
-	$(CC) $(DEFS) $(CFLAGS) -c $(srcdir)/wavplay.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/wavplay.c

 wavplay$(SHLIB_SUFFIX): wavplay.o ../dllinit.o
 	$(SHLIB_LD) wavplay.o ../dllinit.o $(SHLIB_CFLAGS) -o wavplay$(SHLIB_SUFFIX)
@@ -177,4 +177,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
--- a/dll/xmms/Makefile.in
+++ b/dll/xmms/Makefile.in
@@ -167,7 +167,7 @@ Makefile: Makefile.in
 	  && ./config.status

 xmms.o: $(srcdir)/xmms.c
-	$(CC) $(DEFS) $(CFLAGS) `xmms-config --cflags` -c $(srcdir)/xmms.c
+	$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) `xmms-config --cflags` -c $(srcdir)/xmms.c

 xmms$(SHLIB_SUFFIX): xmms.o ../dllinit.o
 	$(SHLIB_LD) xmms.o ../dllinit.o $(SHLIB_CFLAGS) -o xmms$(SHLIB_SUFFIX) `xmms-config --libs`