ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libs: Get rid of Makelib.rules since we only have one library now. 

Merge all the rules into the libwine makefile.
This commit is contained in:
Alexandre Julliard 2006-08-05 21:17:11 +02:00
parent fb2017d4f4
commit fdfc24ca77
5 changed files with 79 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure vendored
View File

File diff suppressed because one or more lines are too long

4
configure.ac
View File

@ -1530,9 +1530,6 @@ AC_SUBST_FILE(MAKE_IMPLIB_RULES)
MAKE_TEST_RULES=dlls/Maketest.rules
AC_SUBST_FILE(MAKE_TEST_RULES)
MAKE_LIB_RULES=libs/Makelib.rules
AC_SUBST_FILE(MAKE_LIB_RULES)
MAKE_PROG_RULES=programs/Makeprog.rules
AC_SUBST_FILE(MAKE_PROG_RULES)
@ -1541,7 +1538,6 @@ Make.rules
dlls/Makedll.rules
dlls/Makeimplib.rules
dlls/Maketest.rules
libs/Makelib.rules
programs/Makeprog.rules
Makefile
dlls/Makefile

1
libs/.gitignore vendored
View File

@ -1,3 +1,2 @@
*.dylib
*.so.1
/Makelib.rules

77
libs/Makelib.rules.in
View File

@ -1,77 +0,0 @@
# Global rules for building shared libraries -*-Makefile-*-
#
# Each individual makefile should define the following variables:
# LIBRARY : name of the library being built (without the lib prefix)
# SOVERSION : the .so file version
#
# plus all variables required by the global Make.rules.in
#
DEFS = $(EXTRADEFS)
DLLFLAGS = @DLLFLAGS@
LIBEXT = @LIBEXT@
LIBNAME = lib$(LIBRARY)
DEFNAME = $(LIBRARY).def
SONAME = $(LIBNAME).so.$(SOVERSION)
DYNAME = $(LIBNAME).$(SOVERSION).dylib
MODULE = $(LIBNAME).$(LIBEXT)
all: $(MODULE) $(MODULE:.dll=.a)
@MAKE_RULES@
$(LIBNAME).so.$(SOVERSION): $(OBJS) $(VERSCRIPT) Makefile.in
$(LDSHARED) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@
$(LIBNAME).so: $(LIBNAME).so.$(SOVERSION)
$(RM) $@ && $(LN_S) $(LIBNAME).so.$(SOVERSION) $@
$(LIBNAME).a: $(DEFNAME)
$(DLLTOOL) -l $@ -d $(SRCDIR)/$(DEFNAME)
$(LIBNAME).dll: $(OBJS) $(DEFNAME) Makefile.in
$(DLLWRAP) --def $(SRCDIR)/$(DEFNAME) -o $@ $(OBJS) $(EXTRALIBS)
$(LIBNAME).$(SOVERSION).dylib: $(OBJS) $(RELPATH) Makefile.in
$(LDSHARED) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@
$(LIBNAME).dylib: $(LIBNAME).$(SOVERSION).dylib
$(RM) $@ && $(LN_S) $(LIBNAME).$(SOVERSION).dylib $@
.PHONY: install-lib-so install-lib-dll install-lib-dylib install-dev-so install-dev-dll install-dev-dylib
install-lib-so: $(LIBNAME).so.$(SOVERSION) dummy
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
$(INSTALL_PROGRAM) $(LIBNAME).so.$(SOVERSION) $(DESTDIR)$(libdir)/$(LIBNAME).so.$(SOVERSION)
install-lib-dll: $(LIBNAME).dll dummy
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
$(INSTALL_DATA) $(LIBNAME).dll $(DESTDIR)$(libdir)/$(LIBNAME).dll
install-lib-dylib: $(LIBNAME).$(SOVERSION).dylib dummy
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
$(INSTALL_PROGRAM) $(LIBNAME).$(SOVERSION).dylib $(DESTDIR)$(libdir)/$(LIBNAME).$(SOVERSION).dylib
install-dev-so: dummy
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
cd $(DESTDIR)$(libdir) && $(RM) $(LIBNAME).so && $(LN_S) $(LIBNAME).so.$(SOVERSION) $(LIBNAME).so
install-dev-dll: $(LIBNAME).a dummy
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
$(INSTALL_DATA) $(LIBNAME).a $(DESTDIR)$(libdir)/$(LIBNAME).a
install-dev-dylib: dummy
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
cd $(DESTDIR)$(libdir) && $(RM) $(LIBNAME).dylib && $(LN_S) $(LIBNAME).$(SOVERSION).dylib $(LIBNAME).dylib
install install-lib:: $(LIBEXT:%=install-lib-%)
install install-dev:: $(LIBEXT:%=install-dev-%)
uninstall::
-cd $(DESTDIR)$(libdir) && $(RM) $(LIBNAME).a $(LIBNAME).dll $(LIBNAME).so $(LIBNAME).so.$(SOVERSION) $(LIBNAME).dylib $(LIBNAME).$(SOVERSION).dylib
clean::
$(RM) $(LIBNAME).so.$(SOVERSION) $(LIBNAME).dll $(LIBNAME).$(SOVERSION).dylib
$(RELPATH):
@cd $(TOOLSDIR)/tools && $(MAKE) relpath

77
libs/wine/Makefile.in
View File

@ -2,11 +2,16 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBRARY = wine
SOVERSION = 1
DLLFLAGS = @DLLFLAGS@
LIBEXT = @LIBEXT@
MODULE = libwine.$(LIBEXT)
VERSCRIPT = $(SRCDIR)/wine.map
EXTRADEFS = -D__WINESRC__ -DWINE_UNICODE_API=""
EXTRALIBS = $(LIBPORT) @DLLIBS@ @CRTLIBS@
DEFS = -D__WINESRC__ -DWINE_UNICODE_API=""
SOVERSION = 1
SONAME = libwine.so.$(SOVERSION)
DYNAME = libwine.$(SOVERSION).dylib
C_SRCS = \
casemap.c \
@ -88,7 +93,11 @@ C_SRCS = \
c_28605.c \
c_28606.c
@MAKE_LIB_RULES@
all: $(MODULE) $(MODULE:.dll=.a)
@MAKE_RULES@
# Special defines needed for config.c
CONFIGDIRS = \
-DBINDIR='"$(bindir)"' \
@ -102,4 +111,64 @@ CONFIGDIRS = \
config.o: config.c $(RELPATH)
$(CC) -c $(ALLCFLAGS) -o $@ $(SRCDIR)/config.c $(CONFIGDIRS)
# Linking rules
libwine.so.$(SOVERSION): $(OBJS) $(VERSCRIPT) Makefile.in
$(LDSHARED) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@
libwine.so: libwine.so.$(SOVERSION)
$(RM) $@ && $(LN_S) libwine.so.$(SOVERSION) $@
libwine.a: wine.def
$(DLLTOOL) -l $@ -d $(SRCDIR)/wine.def
libwine.dll: $(OBJS) wine.def Makefile.in
$(DLLWRAP) --def $(SRCDIR)/wine.def -o $@ $(OBJS) $(EXTRALIBS)
libwine.$(SOVERSION).dylib: $(OBJS) $(RELPATH) Makefile.in
$(LDSHARED) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@
libwine.dylib: libwine.$(SOVERSION).dylib
$(RM) $@ && $(LN_S) libwine.$(SOVERSION).dylib $@
# Install rules
.PHONY: install-lib-so install-lib-dll install-lib-dylib install-dev-so install-dev-dll install-dev-dylib
install-lib-so: libwine.so.$(SOVERSION) dummy
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
$(INSTALL_PROGRAM) libwine.so.$(SOVERSION) $(DESTDIR)$(libdir)/libwine.so.$(SOVERSION)
install-lib-dll: libwine.dll dummy
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
$(INSTALL_DATA) libwine.dll $(DESTDIR)$(libdir)/libwine.dll
install-lib-dylib: libwine.$(SOVERSION).dylib dummy
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
$(INSTALL_PROGRAM) libwine.$(SOVERSION).dylib $(DESTDIR)$(libdir)/libwine.$(SOVERSION).dylib
install-dev-so: dummy
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
cd $(DESTDIR)$(libdir) && $(RM) libwine.so && $(LN_S) libwine.so.$(SOVERSION) libwine.so
install-dev-dll: libwine.a dummy
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
$(INSTALL_DATA) libwine.a $(DESTDIR)$(libdir)/libwine.a
install-dev-dylib: dummy
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
cd $(DESTDIR)$(libdir) && $(RM) libwine.dylib && $(LN_S) libwine.$(SOVERSION).dylib libwine.dylib
install install-lib:: $(LIBEXT:%=install-lib-%)
install install-dev:: $(LIBEXT:%=install-dev-%)
uninstall::
-cd $(DESTDIR)$(libdir) && $(RM) libwine.a libwine.dll libwine.so libwine.so.$(SOVERSION) libwine.dylib libwine.$(SOVERSION).dylib
clean::
$(RM) libwine.so.$(SOVERSION)
$(RELPATH):
@cd $(TOOLSDIR)/tools && $(MAKE) relpath
### Dependencies: