Skip to content

Commit

Permalink
makefiles regenerated
Browse files Browse the repository at this point in the history
  • Loading branch information
pulb committed Apr 20, 2010
1 parent 824958f commit 8504f52
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 26 deletions.
28 changes: 9 additions & 19 deletions MusicBrainz/Makefile
Expand Up @@ -24,7 +24,7 @@ endif

ifeq ($(CONFIG),RELEASE)
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -unsafe -warn:4 -optimize-
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -unsafe -warn:4 -optimize+
ASSEMBLY = bin/Release/MusicBrainz.dll
ASSEMBLY_MDB =
COMPILE_TARGET = library
Expand All @@ -51,15 +51,14 @@ endif

ifeq ($(CONFIG),GNOME_RELEASE)
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -unsafe -warn:4 -optimize- -debug "-define:DEBUG"
ASSEMBLY = bin/Debug/MusicBrainz.dll
ASSEMBLY_MDB = $(ASSEMBLY).mdb
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -unsafe -warn:4 -optimize+
ASSEMBLY = bin/Release/MusicBrainz.dll
ASSEMBLY_MDB =
COMPILE_TARGET = library
PROJECT_REFERENCES =
BUILD_DIR = bin/Debug
BUILD_DIR = bin/Release

MUSICBRAINZ_DLL_MDB_SOURCE=bin/Debug/MusicBrainz.dll.mdb
MUSICBRAINZ_DLL_MDB=$(BUILD_DIR)/MusicBrainz.dll.mdb
MUSICBRAINZ_DLL_MDB=

endif

Expand All @@ -69,13 +68,9 @@ SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
PROGRAMFILES = \
$(MUSICBRAINZ_DLL_MDB)

LINUX_PKGCONFIG = \
$(MUSICBRAINZ_PC)


RESGEN=resgen2

MUSICBRAINZ_PC = $(BUILD_DIR)/musicbrainz.pc

FILES = \
src/Artist.cs \
Expand Down Expand Up @@ -103,26 +98,24 @@ DATA_FILES =

RESOURCES =

EXTRAS = \
musicbrainz.pc.in
EXTRAS =

REFERENCES = \
System \
System.Xml

DLL_REFERENCES =

CLEANFILES = $(PROGRAMFILES) $(LINUX_PKGCONFIG)
CLEANFILES = $(PROGRAMFILES)

#Targets
all: $(ASSEMBLY) $(PROGRAMFILES) $(LINUX_PKGCONFIG) $(top_srcdir)/config.make
all: $(ASSEMBLY) $(PROGRAMFILES) $(top_srcdir)/config.make

include $(top_srcdir)/Makefile.include
#include $(srcdir)/custom-hooks.make



$(eval $(call emit-deploy-wrapper,MUSICBRAINZ_PC,musicbrainz.pc))


$(eval $(call emit_resgen_targets))
Expand All @@ -146,8 +139,6 @@ install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
$(call cp,$(ASSEMBLY),$(DESTDIR)$(libdir)/$(PACKAGE))
$(call cp,$(ASSEMBLY_MDB),$(DESTDIR)$(libdir)/$(PACKAGE))
$(call cp,$(MUSICBRAINZ_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE))
mkdir -p '$(DESTDIR)$(libdir)/pkgconfig'
$(call cp,$(MUSICBRAINZ_PC),$(DESTDIR)$(libdir)/pkgconfig)
make post-install-local-hook prefix=$(prefix)

uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
Expand All @@ -156,7 +147,6 @@ uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
$(call rm,$(ASSEMBLY),$(DESTDIR)$(libdir)/$(PACKAGE))
$(call rm,$(ASSEMBLY_MDB),$(DESTDIR)$(libdir)/$(PACKAGE))
$(call rm,$(MUSICBRAINZ_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE))
$(call rm,$(MUSICBRAINZ_PC),$(DESTDIR)$(libdir)/pkgconfig)
make post-uninstall-local-hook prefix=$(prefix)

install: install-local
Expand Down
6 changes: 0 additions & 6 deletions MusicBrainz/musicbrainz.pc.in

This file was deleted.

2 changes: 1 addition & 1 deletion VolumeDB/Makefile
Expand Up @@ -106,7 +106,7 @@ PROJECT_REFERENCES = \
../Platform.Common.DB/bin/Release/Platform.Common.DB.dll \
../Platform/bin/Release/Platform.dll \
../LibExtractor/bin/Release/LibExtractor.dll \
../MusicBrainz/bin/Debug/MusicBrainz.dll
../MusicBrainz/bin/Release/MusicBrainz.dll
BUILD_DIR = bin/Release

PLATFORM_COMMON_DB_DLL_SOURCE=../Platform.Common.DB/bin/Release/Platform.Common.DB.dll
Expand Down

0 comments on commit 8504f52

Please sign in to comment.