Tidy up makefiles and build process
This commit is contained in:
parent
2fa8321951
commit
e72da7e6ce
2 changed files with 19 additions and 19 deletions
28
Makefile.in
28
Makefile.in
|
@ -8,12 +8,12 @@ INSTALL_DATA = @INSTALL_DATA@
|
|||
DIRECTORY=@DIRINST@/dl/
|
||||
INCLUDES=-I@DIRINST@/include/ -I. -Ilibopm
|
||||
|
||||
SOURCES= opsb.c proxy.c opsb_help.c
|
||||
OBJECTS= opsb.o proxy.o opsb_help.o
|
||||
SRCS= opsb.c proxy.c opsb_help.c
|
||||
OBJS= ${SRCS:.c=.o}
|
||||
TARGET= opsb.so
|
||||
DOCS=README.opsb README.opsb.html opsb.Settings
|
||||
DISTFILES = $(SOURCES) $(DOCS) modconfig.h.in configure install-sh ChangeLog Makefile.in opsb.h libopm/*.c libopm/*.h libopm/README libopm/LICENSE LICENSE libopm/*.in
|
||||
distdir = @PACKAGE@-@VERSION@
|
||||
DISTFILES = $(SRCS) $(DOCS) modconfig.h.in configure install-sh ChangeLog Makefile.in opsb.h libopm/*.c libopm/*.h libopm/README libopm/LICENSE LICENSE libopm/*.in
|
||||
DISTDIR = @PACKAGE@-@VERSION@
|
||||
|
||||
|
||||
|
||||
|
@ -25,8 +25,8 @@ all: module
|
|||
libopm.a:
|
||||
(cd libopm; $(MAKE) $@)
|
||||
|
||||
module: libopm.a $(OBJECTS)
|
||||
$(LD) -shared -o $(TARGET) $(LDFLAGS) $(OBJECTS) libopm/libopm.a
|
||||
module: libopm.a $(OBJS)
|
||||
$(LD) -shared -o $(TARGET) $(LDFLAGS) $(OBJS) libopm/libopm.a
|
||||
|
||||
clean:
|
||||
(cd libopm; $(MAKE) $@)
|
||||
|
@ -39,20 +39,20 @@ install: module
|
|||
if ! test -f $(DIRECTORY)../kpconf/OPSB ; then ./kptool -i doc/opsb.Settings; fi
|
||||
dist:
|
||||
@echo -n "Creating Directories"
|
||||
@-rm -rf $(distdir)
|
||||
@mkdir $(distdir)
|
||||
@mkdir $(distdir)/libopm
|
||||
@-rm -rf $(DISTDIR)
|
||||
@mkdir $(DISTDIR)
|
||||
@mkdir $(DISTDIR)/libopm
|
||||
@echo "Done"
|
||||
@echo -n "Coping Core Distribution Files"
|
||||
@echo -n "Copying Core Distribution Files"
|
||||
@for file in $(DISTFILES); do \
|
||||
echo -n "."; \
|
||||
cp -pr $$file $(distdir)/$$file; \
|
||||
cp -pr $$file $(DISTDIR)/$$file; \
|
||||
done
|
||||
@echo "Done"
|
||||
@tar -czf $(distdir).tar.gz $(distdir)/*
|
||||
@echo "Tar file $(distdir).tar.gz created, Freshmeat Time"
|
||||
@tar -czf $(DISTDIR).tar.gz $(DISTDIR)/*
|
||||
@echo "Tar file $(DISTDIR).tar.gz created, Freshmeat Time"
|
||||
|
||||
$(OBJECTS): Makefile
|
||||
$(OBJS): Makefile
|
||||
|
||||
opsb.o: opsb.h opsb.c modconfig.h
|
||||
proxy.o: opsb.h proxy.c modconfig.h
|
||||
|
|
|
@ -8,8 +8,8 @@ INSTALL_DATA = @INSTALL_DATA@
|
|||
DIRECTORY=@DIRINST@/dl/
|
||||
INCLUDES= -I. -I..
|
||||
|
||||
SOURCES= compat.c config.c inet.c libopm.c list.c malloc.c proxy.c
|
||||
OBJECTS= compat.o config.o inet.o libopm.o list.o malloc.o proxy.o
|
||||
SRCS= compat.c config.c inet.c libopm.c list.c malloc.c proxy.c
|
||||
OBJS= ${SRCS:.c=.o}
|
||||
|
||||
TARGET= libopm.a
|
||||
DOCS=
|
||||
|
@ -20,8 +20,8 @@ all: libopm.a
|
|||
$(CC) -c $(CFLAGS) $(INCLUDES) $<
|
||||
|
||||
|
||||
libopm.a: $(OBJECTS)
|
||||
ar cru $(TARGET) ${OBJECTS}
|
||||
libopm.a: $(OBJS)
|
||||
ar cru $(TARGET) ${OBJS}
|
||||
ranlib $(TARGET)
|
||||
|
||||
clean:
|
||||
|
@ -31,7 +31,7 @@ install:
|
|||
|
||||
dist:
|
||||
|
||||
$(OBJECTS): Makefile
|
||||
$(OBJS): Makefile
|
||||
compat.o: compat.c ../modconfig.h compat.h opm.h opm_common.h
|
||||
config.o: config.c ../modconfig.h malloc.h config.h libopm.h inet.h \
|
||||
opm_common.h opm.h opm_error.h opm_types.h list.h
|
||||
|
|
Reference in a new issue