# HG changeset patch # User giacomo # Date 1165670946 28800 # Node ID 82a9fabb5b460a6ade15acc10b5b0e5c2fa494a8 # Parent b4f1ad07fcd904db5839392b02f7b76a5fca851a [svn] prevent adplug makefile from pointlessly trying to link source files in the core library diff -r b4f1ad07fcd9 -r 82a9fabb5b46 ChangeLog --- a/ChangeLog Sat Dec 09 03:37:53 2006 -0800 +++ b/ChangeLog Sat Dec 09 05:29:06 2006 -0800 @@ -1,3 +1,15 @@ +2006-12-09 11:37:53 +0000 William Pitcock + revision [766] + - add support for hatena (experimental) + + trunk/src/scrobbler/Makefile | 1 + trunk/src/scrobbler/configure.c | 54 ++ + trunk/src/scrobbler/hatena.c | 901 ++++++++++++++++++++++++++++++++++++++++ + trunk/src/scrobbler/hatena.h | 13 + trunk/src/scrobbler/plugin.c | 43 + + 5 files changed, 1007 insertions(+), 5 deletions(-) + + 2006-12-09 10:55:44 +0000 William Pitcock revision [762] - fix some configure behaviour regarding Gerpok diff -r b4f1ad07fcd9 -r 82a9fabb5b46 src/adplug/core/Makefile --- a/src/adplug/core/Makefile Sat Dec 09 03:37:53 2006 -0800 +++ b/src/adplug/core/Makefile Sat Dec 09 05:29:06 2006 -0800 @@ -3,13 +3,15 @@ OBJECTIVE_LIBS_NOINST = libadplugcore.a -SOURCES = adplug.cxx emuopl.cxx fmopl.c diskopl.cxx debug.c fprovide.cxx \ +C_SOURCES = fmopl.c debug.c adlibemu.c +CXX_SOURCES = adplug.cxx emuopl.cxx diskopl.cxx fprovide.cxx \ player.cxx database.cxx hsc.cxx sng.cxx imf.cxx players.cxx protrack.cxx \ a2m.cxx adtrack.cxx amd.cxx bam.cxx d00.cxx dfm.cxx dmo.cxx hsp.cxx ksm.cxx \ mad.cxx mid.cxx mkj.cxx cff.cxx dtm.cxx fmc.cxx mtk.cxx rad.cxx raw.cxx \ sa2.cxx s3m.cxx xad.cxx flash.cxx bmf.cxx hybrid.cxx hyp.cxx psi.cxx rat.cxx \ -u6m.cxx rol.cxx xsm.cxx adlibemu.c dro.cxx lds.cxx temuopl.cxx msc.cxx rix.cxx \ -adl.cxx +u6m.cxx rol.cxx xsm.cxx dro.cxx lds.cxx temuopl.cxx msc.cxx rix.cxx adl.cxx + +SOURCES = $(C_SOURCES) $(CXX_SOURCES) noinst_HEADERS = adplug.h emuopl.h fmopl.h silentopl.h opl.h diskopl.h \ a2m.h amd.h bam.h d00.h dfm.h hsc.h hsp.h imf.h ksm.h lds.h mid.h mkj.h mtk.h \ @@ -21,6 +23,6 @@ CXXFLAGS += $(PICFLAGS) $(BINIO_CFLAGS) -I../../../../intl -I../../../.. -Dstricmp=strcasecmp $(BEEP_DEFINES) CFLAGS += $(PICFLAGS) $(BINIO_CFLAGS) -I../../../../intl -I../../../.. -Dstricmp=strcasecmp $(BEEP_DEFINES) -OBJECTS = ${SOURCES:.c=.o} ${SOURCES:.cxx=.o} +OBJECTS = ${C_SOURCES:.c=.o} ${CXX_SOURCES:.cxx=.o} include ../../../mk/objective.mk