/soc/2013/ankitkv/gobjectification: c6083b1e64aa: Merged soc.201...

[Ankit Vani]

Changeset: c6083b1e64aa81a05fdc19aa33e58e0a7451bfa7
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-10-23 22:13 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/c6083b1e64aa

Description:

Merged soc.2013.gobjectification branch

diffstat:

 libpurple/Makefile.am      |  8 ++++----
 libpurple/Makefile.mingw   |  8 ++++----
 libpurple/enums.c.template |  0 
 libpurple/enums.h.template |  0 
 4 files changed, 8 insertions(+), 8 deletions(-)

diffs (46 lines):

diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -237,11 +237,11 @@ marshallers.c: marshallers.list marshall
 	$(AM_V_GEN)echo "#include \"marshallers.h\"" > marshallers.c
 	$(AM_V_at)$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --body >> marshallers.c
 
-enums.h: enums.h.template $(purple_enumheaders)
-	$(AM_V_GEN)$(GLIB_MKENUMS) --template enums.h.template $(purple_enumheaders) > $@
+enums.h: enums.h.in $(purple_enumheaders)
+	$(AM_V_GEN)$(GLIB_MKENUMS) --template enums.h.in $(purple_enumheaders) > $@
 
-enums.c: enums.c.template $(purple_enumheaders)
-	$(AM_V_GEN)$(GLIB_MKENUMS) --template enums.c.template $(purple_enumheaders) > $@
+enums.c: enums.c.in $(purple_enumheaders)
+	$(AM_V_GEN)$(GLIB_MKENUMS) --template enums.c.in $(purple_enumheaders) > $@
 
 CLEANFILES = \
 	enums.c \
diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -214,13 +214,13 @@ marshallers.c: marshallers.list marshall
 	@echo "#include \"marshallers.h\"" > marshallers.c
 	@$(GLIB_GENMARSHAL) --prefix=purple_smarshal $< --body >> marshallers.c
 
-enums.h: enums.h.template $(ENUM_HEADERS)
+enums.h: enums.h.in $(ENUM_HEADERS)
 	@echo -e "  GEN\t$@"
-	@$(GLIB_MKENUMS) --template enums.h.template $(ENUM_HEADERS) > enums.h
+	@$(GLIB_MKENUMS) --template enums.h.in $(ENUM_HEADERS) > enums.h
 
-enums.c: enums.c.template enums.h $(ENUM_HEADERS)
+enums.c: enums.c.in enums.h $(ENUM_HEADERS)
 	@echo -e "  GEN\t$@"
-	@$(GLIB_MKENUMS) --template enums.c.template $(ENUM_HEADERS) > enums.c
+	@$(GLIB_MKENUMS) --template enums.c.in $(ENUM_HEADERS) > enums.c
 
 $(TARGET).dll $(TARGET).dll.a: $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(TARGET).def,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
diff --git a/libpurple/enums.c.template b/libpurple/enums.c.in
rename from libpurple/enums.c.template
rename to libpurple/enums.c.in
diff --git a/libpurple/enums.h.template b/libpurple/enums.h.in
rename from libpurple/enums.h.template
rename to libpurple/enums.h.in