From 07aea3b40e5d92b2af28cbf54d5aed8fac0afdd0 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Tue, 6 Apr 2004 04:03:34 +0000
Subject: [PATCH] More clean-ups
---
src/doors/ny2008/src/Makefile | 39 ++++++++++++++-------------
src/doors/ny2008/src/jackpot/Makefile | 15 ++++++-----
2 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/doors/ny2008/src/Makefile b/src/doors/ny2008/src/Makefile
index f6d491235c..7d69850cc3 100644
--- a/src/doors/ny2008/src/Makefile
+++ b/src/doors/ny2008/src/Makefile
@@ -3,58 +3,59 @@ CXX = g++
UIFC_SRC = ../../../uifc
XPDEV_SRC = ../../../xpdev
ODOOR_SRC = ../../../odoors
-CCFLAGS += -O2
-CCFLAGS += -g
-CCFLAGS += -I${ODOOR_SRC} -L${ODOOR_SRC} -I${XPDEV_SRC} -I${UIFC_SRC}
+CFLAGS = ${CFLAGS} -O2
+CFLAGS = ${CFLAGS} -g
+CFLAGS = ${CFLAGS} -I${ODOOR_SRC} -I${XPDEV_SRC} -I${UIFC_SRC}
# Needed for struct alignment!
-CCFLAGS += -fshort-enums
+CFLAGS = ${CFLAGS} -fshort-enums
+LDFLAGS = ${LDFLAGS} -L${ODOOR_SRC}
all : ny2008 aedit nyibbs nyedit medit
filewrap.o:
- $(CC) $(CCFLAGS) -c ${XPDEV_SRC}/filewrap.c
+ $(CC) $(CFLAGS) -c ${XPDEV_SRC}/filewrap.c
dirwrap.o:
- $(CC) $(CCFLAGS) -c ${XPDEV_SRC}/dirwrap.c
+ $(CC) $(CFLAGS) -c ${XPDEV_SRC}/dirwrap.c
genwrap.o:
- $(CC) $(CCFLAGS) -c ${XPDEV_SRC}/genwrap.c
+ $(CC) $(CFLAGS) -c ${XPDEV_SRC}/genwrap.c
ciowrap.o:
- $(CC) $(CCFLAGS) -c ${UIFC_SRC}/ciowrap.c
+ $(CC) $(CFLAGS) -c ${UIFC_SRC}/ciowrap.c
fights.o : fights.cpp fights.h ny2008.h
- $(CXX) $(CCFLAGS) -c fights.cpp
+ $(CXX) $(CFLAGS) -c fights.cpp
ibbsny.o : ibbsny.cpp ibbsny.h ny2008.h
- $(CXX) $(CCFLAGS) -c ibbsny.cpp
+ $(CXX) $(CFLAGS) -c ibbsny.cpp
igmsup.o : igmsup.cpp ny2008.h
- $(CXX) $(CCFLAGS) -c igmsup.cpp
+ $(CXX) $(CFLAGS) -c igmsup.cpp
second.o : second.cpp ny2008.h
- $(CXX) $(CCFLAGS) -c second.cpp
+ $(CXX) $(CFLAGS) -c second.cpp
chatadd.o : chatadd.cpp ny2008.h
- $(CXX) $(CCFLAGS) -c chatadd.cpp
+ $(CXX) $(CFLAGS) -c chatadd.cpp
ny2008.o : ny2008.cpp
- $(CXX) $(CCFLAGS) -c ny2008.cpp
+ $(CXX) $(CFLAGS) -c ny2008.cpp
ny2008 : ny2008.o ibbsny.o second.o igmsup.o ibbsny.o fights.o dirwrap.o filewrap.o genwrap.o ciowrap.o chatadd.o
- $(CXX) $(CCFLAGS) ciowrap.o ny2008.o chatadd.o dirwrap.o filewrap.o genwrap.o fights.o ibbsny.o igmsup.o second.o -lcurses -lODoors -lm -o ../ny2008
+ $(CXX) $(CFLAGS) ${LDFLAGS} ciowrap.o ny2008.o chatadd.o dirwrap.o filewrap.o genwrap.o fights.o ibbsny.o igmsup.o second.o -lcurses -lODoors -lm -o ../ny2008
aedit : aedit.cpp
- $(CXX) $(CCFLAGS) aedit.cpp -o ../aedit
+ $(CXX) $(CFLAGS) ${LDFLAGS} aedit.cpp -o ../aedit
medit : medit.cpp
- $(CXX) $(CCFLAGS) medit.cpp -o ../medit
+ $(CXX) $(CFLAGS) ${LDFLAGS} medit.cpp -o ../medit
nyibbs : nyibbs.cpp ibbsny.o filewrap.o genwrap.o dirwrap.o
- $(CXX) $(CCFLAGS) nyibbs.cpp ibbsny.o filewrap.o genwrap.o dirwrap.o -o ../nyibbs
+ $(CXX) $(CFLAGS) ${LDFLAGS} nyibbs.cpp ibbsny.o filewrap.o genwrap.o dirwrap.o -o ../nyibbs
nyedit : nyedit.cpp nyedit.h filewrap.o genwrap.o dirwrap.o ciowrap.o
- $(CXX) $(CCFLAGS) nyedit.cpp filewrap.o genwrap.o dirwrap.o ciowrap.o -lcurses -lODoors -lm -o ../nyedit
+ $(CXX) $(CFLAGS) ${LDFLAGS} nyedit.cpp filewrap.o genwrap.o dirwrap.o ciowrap.o -lcurses -lODoors -lm -o ../nyedit
clean :
rm -f *.o
diff --git a/src/doors/ny2008/src/jackpot/Makefile b/src/doors/ny2008/src/jackpot/Makefile
index 60476f0db4..3bc9b119a4 100644
--- a/src/doors/ny2008/src/jackpot/Makefile
+++ b/src/doors/ny2008/src/jackpot/Makefile
@@ -3,22 +3,23 @@ CXX = g++
UIFC_SRC = ../../../../uifc
XPDEV_SRC = ../../../../xpdev
ODOOR_SRC = ../../../../odoors
-CCFLAGS += -O2
-CCFLAGS += -g
-CCFLAGS += -I${ODOOR_SRC} -L${ODOOR_SRC} -I${XPDEV_SRC} -I${UIFC_SRC}
+CFLAGS = ${CFLAGS} -O2
+CFLAGS = ${CFLAGS} -g
+CFLAGS = ${CFLAGS} -I${ODOOR_SRC} -I${XPDEV_SRC} -I${UIFC_SRC}
# Needed for struct alignment!
-CCFLAGS += -fshort-enums
+CFLAGS = ${CFLAGS} -fshort-enums
+LDFLAGS = ${LDFLAGS} -L${ODOOR_SRC}
all : jackpot
jackpot : jackpot.cpp jackpot.h dirwrap.o genwrap.o
- $(CXX) $(CCFLAGS) jackpot.cpp dirwrap.o genwrap.o -o ../../jackpot -lODoors
+ $(CXX) $(CFLAGS) ${LDFLAGS} jackpot.cpp dirwrap.o genwrap.o -o ../../jackpot -lODoors
dirwrap.o:
- $(CC) $(CCFLAGS) -c ${XPDEV_SRC}/dirwrap.c
+ $(CC) $(CFLAGS) -c ${XPDEV_SRC}/dirwrap.c
genwrap.o:
- $(CC) $(CCFLAGS) -c ${XPDEV_SRC}/genwrap.c
+ $(CC) $(CFLAGS) -c ${XPDEV_SRC}/genwrap.c
clean:
rm -f ../../jackpot
--
GitLab