summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-31 06:08:07 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-31 06:08:07 +0000
commitc3c74c3bcbb9792ec60106443adc6bd790cfec1f (patch)
tree37f3e7c15461ca43559e685795a8e2e7da565d57
parent51680d33aa582128f94a6091fba2e203ebba8faa (diff)
downloadhercules-c3c74c3bcbb9792ec60106443adc6bd790cfec1f.tar.gz
hercules-c3c74c3bcbb9792ec60106443adc6bd790cfec1f.tar.bz2
hercules-c3c74c3bcbb9792ec60106443adc6bd790cfec1f.tar.xz
hercules-c3c74c3bcbb9792ec60106443adc6bd790cfec1f.zip
Reverted r12230. cUSTOM_CFLAGS is redundant since you can achieve the same result by setting CFLAGS.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13022 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/char/Makefile.in2
-rw-r--r--src/char_sql/Makefile.in2
-rw-r--r--src/common/Makefile.in6
-rw-r--r--src/ladmin/Makefile.in2
-rw-r--r--src/login/Makefile.in4
-rw-r--r--src/map/Makefile.in4
-rw-r--r--src/plugins/Makefile.in2
7 files changed, 11 insertions, 11 deletions
diff --git a/src/char/Makefile.in b/src/char/Makefile.in
index 37b464991..359e19b01 100644
--- a/src/char/Makefile.in
+++ b/src/char/Makefile.in
@@ -40,7 +40,7 @@ obj_txt:
-mkdir obj_txt
obj_txt/%.o: %.c $(CHAR_H) $(COMMON_H)
- @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @CC@ @CFLAGS@ -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing common object files
../common/obj_all/%.o:
diff --git a/src/char_sql/Makefile.in b/src/char_sql/Makefile.in
index 63a53e9af..a36dcd14b 100644
--- a/src/char_sql/Makefile.in
+++ b/src/char_sql/Makefile.in
@@ -54,7 +54,7 @@ obj_sql:
-mkdir obj_sql
obj_sql/%.o: %.c $(CHAR_H) $(COMMON_H) $(COMMON_SQL_H)
- @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @CC@ @CFLAGS@ @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing common object files
../common/obj_all/%.o:
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 75450f46a..bda9e1911 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -60,13 +60,13 @@ common_sql: obj_sql $(COMMON_SQL_OBJ)
obj_all/%.o: %.c $(COMMON_H)
- @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
obj_all/mini%.o: %.c $(COMMON_H)
- @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DMINICORE @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @CC@ @CFLAGS@ -DMINICORE @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
obj_sql/%.o: %.c $(COMMON_H) $(COMMON_SQL_H)
- @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @CC@ @CFLAGS@ @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
HAVESVN = $(shell which svnversion)
diff --git a/src/ladmin/Makefile.in b/src/ladmin/Makefile.in
index 365252f63..4703dded1 100644
--- a/src/ladmin/Makefile.in
+++ b/src/ladmin/Makefile.in
@@ -35,7 +35,7 @@ obj_all:
-mkdir obj_all
obj_all/%.o: %.c $(LADMIN_H) $(COMMON_H)
- @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing common object files
../common/obj_all/%.o:
diff --git a/src/login/Makefile.in b/src/login/Makefile.in
index 1f6080746..611ca385b 100644
--- a/src/login/Makefile.in
+++ b/src/login/Makefile.in
@@ -71,10 +71,10 @@ login-server_sql: $(LOGIN_SERVER_SQL_DEPENDS)
# login object files
obj_txt/%.o: %.c $(LOGIN_H) $(COMMON_H)
- @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DWITH_TXT @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @CC@ @CFLAGS@ -DWITH_TXT @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
obj_sql/%.o: %.c $(LOGIN_H) $(COMMON_H)
- @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @CC@ @CFLAGS@ -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing common object files
../common/obj_all/%.o:
diff --git a/src/map/Makefile.in b/src/map/Makefile.in
index ba2f3effd..61e41797e 100644
--- a/src/map/Makefile.in
+++ b/src/map/Makefile.in
@@ -90,10 +90,10 @@ map-server_sql: obj_sql $(MAP_SQL_OBJ) $(COMMON_OBJ) $(COMMON_SQL_OBJ)
# map object files
obj_txt/%.o: %.c $(MAP_H) $(COMMON_H)
- @CC@ @CFLAGS@ $(PCRE_CFLAGS) $(CUSTOM_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @CC@ @CFLAGS@ $(PCRE_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
obj_sql/%.o: %.c $(MAP_H) $(COMMON_H) $(COMMON_SQL_H)
- @CC@ @CFLAGS@ $(PCRE_CFLAGS) $(CUSTOM_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @CC@ @CFLAGS@ $(PCRE_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing common object files
../common/obj_all/%.o:
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index 6a902e1d7..c21bcd7d9 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -50,7 +50,7 @@ gui@DLLEXT@: ../../plugins/gui.conf
upnp@DLLEXT@: ../../plugins/upnp.conf
sig@DLLEXT@: sig.c $(COMMON_OBJ)
- @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) @CPPFLAGS@ @LDFLAGS@ -shared -o ../../plugins/$@ $< $(COMMON_OBJ)
+ @CC@ @CFLAGS@ @CPPFLAGS@ @LDFLAGS@ -shared -o ../../plugins/$@ $< $(COMMON_OBJ)
../../plugins/%.conf: %.txt
cp -r $< $@