From 5245e666a09df5f401c1329bf5ee1fc1b09b1d16 Mon Sep 17 00:00:00 2001
From: FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 20 Sep 2007 11:09:36 +0000
Subject: * Merged the tmpsql branch: - Abstraction for the sql code (sql.c/h).
 - New configure script and makefiles. - Restored txt zeny logging code.
 (r10814) - Rewrote mapserver's sql code - itemdb, mobdb, mapreg, logs.
 (r10814) - Fixed a precedence issue (&& and ) in char_sql/char.c. (r10833) -
 Improved db reading code a bit for consistency. (r11077) - Added separate
 atcommand for mail deletion. (r11077) - Corrected a few messages that said
 "new" instead of "unread". (r11077) - Broadcast (*) messages now use "*" as
 the target's name (not ""). (r11077) - Moved StringBuf code from utils.c/h to
 strlib.c/h. (r11084 r11117) - Some misc login server cleanups (reformatting
 etc). (r11136) - Corrected/modified some header entries. (r11141 r11147
 11148) - Adjusted VS project files. (r11147) - Adjusted the way the sql
 charserver does item saving. (r11192) - Corrected usage of reserved keyword
 'friend' in mmo.h. (r11192)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11245 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/plugins/Makefile    | 42 -------------------------------
 src/plugins/Makefile.in | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 42 deletions(-)
 delete mode 100644 src/plugins/Makefile
 create mode 100644 src/plugins/Makefile.in

(limited to 'src/plugins')

diff --git a/src/plugins/Makefile b/src/plugins/Makefile
deleted file mode 100644
index bac69f70f..000000000
--- a/src/plugins/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-
-OBJECTS = sample.dll sig.dll pid.dll gui.dll upnp.dll console.dll
-
-ifdef CYGWIN
-   PLUGINEXT = dll
-else
-   PLUGINEXT = so
-endif
-
-PLUGINS = $(OBJECTS:%.dll=%.$(PLUGINEXT))
-COMMON_H = ../common/plugin.h ../common/cbasetypes.h
-
-txt sql all: $(PLUGINS)
-
-%.$(PLUGINEXT): %.c
-	$(CC) $(CFLAGS) -shared -o ../../plugins/$@ $<
-
-sig.$(PLUGINEXT): sig.c
-	$(CC) $(CFLAGS) -shared -o ../../plugins/$@ $< \
-	../common/obj/showmsg.o ../common/obj/utils.o \
-	../common/obj/minimalloc.o
-
-gui.$(PLUGINEXT): ../../plugins/gui.conf
-upnp.$(PLUGINEXT): ../../plugins/upnp.conf
-
-../../plugins/%.conf: %.txt
-	cp -r $< $@
-
-../../plugins/gui.conf: gui.txt
-../../plugins/upnp.conf: upnp.txt
-
-depend:
-	makedepend -fGNUmakefile -o.$(PLUGINEXT) -Y. -Y../common *.c $(PLUGINS:%=../../plugins/%)
-clean:
-	rm -rf $(PLUGINS) GNUmakefile
-
-# DO NOT DELETE
-
-sample.$(PLUGINEXT): sample.c $(COMMON_H)
-sig.$(PLUGINEXT): sig.c $(COMMON_H)
-pid.$(PLUGINEXT): pid.c $(COMMON_H)
-gui.$(PLUGINEXT): gui.c $(COMMON_H)
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
new file mode 100644
index 000000000..769771aca
--- /dev/null
+++ b/src/plugins/Makefile.in
@@ -0,0 +1,67 @@
+@SET_MAKE@
+
+PLUGINS = sample sig pid gui upnp console
+
+COMMON_H = ../common/plugin.h ../common/cbasetypes.h
+
+#####################################################################
+.PHONY : all $(PLUGINS) clean help
+
+all: $(PLUGINS)
+
+sample: sample@DLLEXT@
+
+sig: sig@DLLEXT@
+
+pid: pid@DLLEXT@
+
+gui: gui@DLLEXT@
+
+upnp: upnp@DLLEXT@
+
+console: console@DLLEXT@
+
+clean:
+	rm -rf *.o
+
+help:
+	@echo "possible targets are $(PLUGINS:%='%') 'all' 'clean' 'help'"
+	@echo "'sample'   - sample plugin"
+	@echo "'sig'      - signal handler plugin"
+	@echo "'pid'      - process id plugin"
+	@echo "'gui'      - gui plugin"
+	@echo "'upnp'     - upnp plugin"
+	@echo "'console'  - console plugin"
+	@echo "'all'      - builds all above targets"
+	@echo "'clean'    - cleans builds and objects"
+	@echo "'help'     - outputs this message"
+
+#####################################################################
+
+%@DLLEXT@: %.c
+	@CC@ @CFLAGS@ @CPPFLAGS@ -shared -o ../../plugins/$@ $<
+
+sig@DLLEXT@: sig.c
+	@$(MAKE) -C ../common txt
+	@CC@ @CFLAGS@ @CPPFLAGS@ -shared -o ../../plugins/$@ $< \
+	../common/obj/showmsg.o ../common/obj/utils.o ../common/obj/strlib.o \
+	../common/obj/minimalloc.o
+
+gui@DLLEXT@: ../../plugins/gui.conf
+upnp@DLLEXT@: ../../plugins/upnp.conf
+
+../../plugins/%.conf: %.txt
+	cp -r $< $@
+
+../../plugins/gui.conf: gui.txt
+../../plugins/upnp.conf: upnp.txt
+
+# DO NOT DELETE
+
+sample@DLLEXT@: sample.c $(COMMON_H)
+sig@DLLEXT@: sig.c $(COMMON_H)
+pid@DLLEXT@: pid.c $(COMMON_H)
+gui@DLLEXT@: gui.c $(COMMON_H)
+#TODO where is upnp.c? [FlavioJS]
+#upnp@DLLEXT@: upnp.c $(COMMON_H)
+console@DLLEXT@: console.c $(COMMON_H)
-- 
cgit v1.2.3-60-g2f50