diff --git a/src/plugin_common/Makefile.am b/src/plugin_common/Makefile.am index 4e927810..7398e5b5 100644 --- a/src/plugin_common/Makefile.am +++ b/src/plugin_common/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir)/include -noinst_LIBRARIES = libplugin-common.a +noinst_LIBRARIES = libplugin_common.a noinst_HEADERS = \ all.h \ diff --git a/src/plugin_common/Makefile.lite b/src/plugin_common/Makefile.lite index ec12e5cf..0136bffb 100644 --- a/src/plugin_common/Makefile.lite +++ b/src/plugin_common/Makefile.lite @@ -2,7 +2,7 @@ # GNU makefile # -LIB_NAME = libplugin-common +LIB_NAME = libplugin_common INCLUDES = -I../../include -I$(HOME)/local/include DEFINES = -DFLAC__HAS_ID3LIB -DID3LIB_MAJOR=3 -DID3LIB_MINOR=8 -DID3LIB_PATCH=0 diff --git a/src/plugin_common/Makefile.vc b/src/plugin_common/Makefile.vc index 22060131..6154b03b 100644 --- a/src/plugin_common/Makefile.vc +++ b/src/plugin_common/Makefile.vc @@ -18,11 +18,11 @@ C_FILES= \ OBJS= $(C_FILES:.c=.obj) -all: plugin-common.lib +all: plugin_common.lib -plugin-common.lib: $(OBJS) +plugin_common.lib: $(OBJS) link.exe -lib /nodefaultlib -out:../../obj/lib/$*.lib $(OBJS) clean: -del *.obj *.pch - -del ..\..\obj\lib\plugin-common.lib ..\..\obj\lib\plugin-common.pdb + -del ..\..\obj\lib\plugin_common.lib ..\..\obj\lib\plugin_common.pdb diff --git a/src/plugin_xmms/Makefile.lite b/src/plugin_xmms/Makefile.lite index 0c3c7a62..01f317bd 100644 --- a/src/plugin_xmms/Makefile.lite +++ b/src/plugin_xmms/Makefile.lite @@ -21,7 +21,7 @@ LIB_NAME = libxmms-flac INCLUDES = $(shell xmms-config --cflags) -I./include -I../../include -I.. -LIBS = ../../obj/lib/libFLAC.a ../../obj/lib/libplugin-common.a +LIBS = ../../obj/lib/libFLAC.a ../../obj/lib/libplugin_common.a OBJS = \ charset.o \