"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "Makefile" between
cpuid-20180519.src.tar.gz and cpuid-20200112.src.tar.gz

About: cpuid dumps detailed x86 CPUID information about the CPU(s).

Makefile  (cpuid-20180519.src):Makefile  (cpuid-20200112.src)
CFLAGS+=-g CFLAGS+=-g
CPPFLAGS?= CPPFLAGS?=
LDFLAGS?= LDFLAGS?=
ifneq (,$(findstring arch=i386,$(CFLAGS))) ifneq (,$(findstring arch=i386,$(CFLAGS)))
CISA=-m32 CISA=-m32
endif endif
CFL=$(CPPFLAGS) $(CFLAGS) $(CISA) -Wall -Wshadow -Wcast-align -Wredundant-decls CFL=$(CPPFLAGS) $(CFLAGS) $(CISA) -Wall -Wshadow -Wcast-align -Wredundant-decls
-Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return -Wstrict-prot -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return -Wstrict-prot
otypes -Wmissing-prototypes -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION) otypes -Wmissing-prototypes -Wimplicit-fallthrough -Wunused-parameter -D_FILE_OF
FSET_BITS=64 -DVERSION=$(VERSION)
INSTALL_STRIP=-s
PACKAGE=cpuid PACKAGE=cpuid
VERSION=20180519 VERSION=20200112
RELEASE=1 RELEASE=1
PROG=$(PACKAGE) PROG=$(PACKAGE)
SRC_TAR=$(PACKAGE)-$(VERSION).src.tar.gz SRC_TAR=$(PACKAGE)-$(VERSION).src.tar.gz
i386_TAR=$(PACKAGE)-$(VERSION).i386.tar.gz i386_TAR=$(PACKAGE)-$(VERSION).i386.tar.gz
x86_64_TAR=$(PACKAGE)-$(VERSION).x86_64.tar.gz x86_64_TAR=$(PACKAGE)-$(VERSION).x86_64.tar.gz
TARS=$(SRC_TAR) $(i386_TAR) $(x86_64_TAR) TARS=$(SRC_TAR) $(i386_TAR) $(x86_64_TAR)
SRC_RPM=$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm SRC_RPM=$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
i386_RPM=$(PACKAGE)-$(VERSION)-$(RELEASE).i386.rpm i386_RPM=$(PACKAGE)-$(VERSION)-$(RELEASE).i386.rpm
x86_64_RPM=$(PACKAGE)-$(VERSION)-$(RELEASE).x86_64.rpm x86_64_RPM=$(PACKAGE)-$(VERSION)-$(RELEASE).x86_64.rpm
RPMS=$(SRC_RPM) $(i386_RPM) $(x86_64_RPM) RPMS=$(SRC_RPM) $(i386_RPM) $(x86_64_RPM)
i386_DEBUG_RPM=$(PACKAGE)-debuginfo-$(VERSION)-$(RELEASE).i386.rpm i386_DEBUG_RPM=$(PACKAGE)-debuginfo-$(VERSION)-$(RELEASE).i386.rpm
x86_64_DEBUG_RPM=$(PACKAGE)-debuginfo-$(VERSION)-$(RELEASE).x86_64.rpm x86_64_DEBUG_RPM=$(PACKAGE)-debuginfo-$(VERSION)-$(RELEASE).x86_64.rpm
DEBUG_RPMS=$(i386_DEBUG_RPM) $(x86_64_DEBUG_RPM) DEBUG_RPMS=$(i386_DEBUG_RPM) $(x86_64_DEBUG_RPM)
i386_DEBUGSOURCE_RPM=$(PACKAGE)-debugsource-$(VERSION)-$(RELEASE).i386.rpm
x86_64_DEBUGSOURCE_RPM=$(PACKAGE)-debugsource-$(VERSION)-$(RELEASE).x86_64.rpm
DEBUGSOURCE_RPMS=$(i386_DEBUGSOURCE_RPM) $(x86_64_DEBUGSOURCE_RPM)
SRCS=cpuid.c SRCS=cpuid.c
OTHER_SRCS=Makefile $(PROG).man cpuinfo2cpuid \ OTHER_SRCS=Makefile $(PROG).man cpuinfo2cpuid \
$(PACKAGE).proto.spec $(PACKAGE).spec \ $(PACKAGE).proto.spec $(PACKAGE).spec \
ChangeLog FUTURE LICENSE ChangeLog FUTURE LICENSE
OTHER_BINS=$(PROG).man cpuinfo2cpuid.man OTHER_BINS=$(PROG).man cpuinfo2cpuid.man
REL_DIR=../$(shell date +%Y-%m-%d) REL_DIR=../$(shell date +%Y-%m-%d)
WEB_DIR=/toad2/apps.mine/www/www/$(PROG) WEB_DIR=/toad2/apps.mine/www/www/$(PROG)
skipping to change at line 54 skipping to change at line 58
$(PROG).man.gz: $(PROG).man $(PROG).man.gz: $(PROG).man
gzip < $< > $@ gzip < $< > $@
cpuinfo2cpuid.man: cpuinfo2cpuid Makefile cpuinfo2cpuid.man: cpuinfo2cpuid Makefile
pod2man -r "$(VERSION)" -c "" $< > $@ pod2man -r "$(VERSION)" -c "" $< > $@
cpuinfo2cpuid.man.gz: cpuinfo2cpuid.man cpuinfo2cpuid.man.gz: cpuinfo2cpuid.man
gzip < $< > $@ gzip < $< > $@
install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
install -D -s -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG) install -D $(INSTALL_STRIP) -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1 install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1/$(
/$(PROG).1.gz PROG).1.gz
install -D -m 755 cpuinfo2cpuid $(BUILDROOT)/usr/bin/cpuinfo2cp install -D -m 755 cpuinfo2cpuid $(BUILDROOT)/usr/bin/cpuinfo2cpuid
uid install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cp
install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1 uinfo2cpuid.1.gz
/cpuinfo2cpuid.1.gz
clean: clean:
rm -f $(PROG) $(PROG).i386 $(PROG).x86_64 rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
rm -f $(PROG).man.gz rm -f $(PROG).man.gz
rm -f cpuinfo2cpuid.man cpuinfo2cpuid.man.gz rm -f cpuinfo2cpuid.man cpuinfo2cpuid.man.gz
rm -f $(PACKAGE).spec rm -f $(PACKAGE).spec
rm -f $(TARS) rm -f $(TARS)
rm -f $(RPMS) rm -f $(RPMS)
rm -f $(DEBUG_RPMS) rm -f $(DEBUG_RPMS)
rm -f $(DEBUGSOURCE_RPMS)
rm -f $(PACKAGE)-*.src.tar.gz $(PACKAGE)-*.i386.tar.gz $(PACKAGE)-*.x86_6 4.tar.gz rm -f $(PACKAGE)-*.src.tar.gz $(PACKAGE)-*.i386.tar.gz $(PACKAGE)-*.x86_6 4.tar.gz
rm -f $(PACKAGE)-*.src.rpm $(PACKAGE)-*.i386.rpm $(PACKAGE)-*.x86_64.rpm rm -f $(PACKAGE)-*.src.rpm $(PACKAGE)-*.i386.rpm $(PACKAGE)-*.x86_64.rpm
rm -f $(PACKAGE)-debuginfo-*.i386.rpm $(PACKAGE)-debuginfo-*.x86_64.rpm rm -f $(PACKAGE)-debuginfo-*.i386.rpm $(PACKAGE)-debuginfo-*.x86_64.rpm
# Todd's Development rules # Todd's Development rules
$(PROG).i386: cpuid.c Makefile $(PROG).i386: cpuid.c Makefile
$(CC) -m32 -Wl,--hash-style=both $(CFL) $(LDFLAGS) -o $@ cpuid.c $(CC) -m32 -Wl,--hash-style=both $(CFL) $(LDFLAGS) -o $@ cpuid.c
$(PROG).x86_64: cpuid.c Makefile $(PROG).x86_64: cpuid.c Makefile
skipping to change at line 127 skipping to change at line 132
@ls -1d $(PROG).x86_64 $(OTHER_BINS) | cpio -pdmuv $(PACKAGE)-$(VERSION) @ls -1d $(PROG).x86_64 $(OTHER_BINS) | cpio -pdmuv $(PACKAGE)-$(VERSION)
@mv $(PACKAGE)-$(VERSION)/$(PROG).x86_64 $(PACKAGE)-$(VERSION)/$(PROG) @mv $(PACKAGE)-$(VERSION)/$(PROG).x86_64 $(PACKAGE)-$(VERSION)/$(PROG)
@(cd $(PACKAGE)-$(VERSION); strip $(PROG)) @(cd $(PACKAGE)-$(VERSION); strip $(PROG))
@tar cvf - $(PACKAGE)-$(VERSION) | gzip -c >| $(x86_64_TAR) @tar cvf - $(PACKAGE)-$(VERSION) | gzip -c >| $(x86_64_TAR)
@rm -rf $(PACKAGE)-$(VERSION) @rm -rf $(PACKAGE)-$(VERSION)
src_tar: $(SRC_TAR) src_tar: $(SRC_TAR)
tar tars: $(TARS) tar tars: $(TARS)
$(i386_RPM) $(i386_DEBUG_RPM) $(SRC_RPM): $(SRC_TAR) $(PACKAGE).spec $(i386_RPM) $(i386_DEBUG_RPM) $(i386_DEBUGSOURCE_RPM) $(SRC_RPM): $(SRC_TAR) $(P ACKAGE).spec
@echo "Building i386 RPMs" @echo "Building i386 RPMs"
@rm -rf build @rm -rf build buildroot
@mkdir buildroot
@mkdir build @mkdir build
@rpmbuild -ba --target i386 \ @rpmbuild -v -ba --target i386 \
--buildroot "${PWD}/build" \ --buildroot "${PWD}/buildroot" \
--define "_builddir ${PWD}/build" \ --define "_builddir ${PWD}/build" \
--define "_rpmdir ${PWD}" \ --define "_rpmdir ${PWD}" \
--define "_srcrpmdir ${PWD}" \ --define "_srcrpmdir ${PWD}" \
--define "_sourcedir ${PWD}" \ --define "_sourcedir ${PWD}" \
--define "_specdir ${PWD}" \ --define "_specdir ${PWD}" \
--define "__check_files ''" \
--define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH }.rpm" \ --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH }.rpm" \
$(PACKAGE).spec $(PACKAGE).spec
@rm -rf build @rm -rf build buildroot
$(x86_64_RPM) $(x86_64_DEBUG_RPM): $(SRC_TAR) $(PACKAGE).spec $(x86_64_RPM) $(x86_64_DEBUG_RPM) $(x86_64_DEBUGSOURCE_RPM): $(SRC_TAR) $(PACKAG E).spec
@echo "Building x86_64 RPMs" @echo "Building x86_64 RPMs"
@rm -rf build @rm -rf build buildroot
@mkdir buildroot
@mkdir build @mkdir build
@rpmbuild -ba --target x86_64 \ @rpmbuild -v -ba --target x86_64 \
--buildroot "${PWD}/build" \ --buildroot "${PWD}/buildroot" \
--define "_builddir ${PWD}/build" \ --define "_builddir ${PWD}/build" \
--define "_rpmdir ${PWD}" \ --define "_rpmdir ${PWD}" \
--define "_srcrpmdir ${PWD}" \ --define "_srcrpmdir ${PWD}" \
--define "_sourcedir ${PWD}" \ --define "_sourcedir ${PWD}" \
--define "_specdir ${PWD}" \ --define "_specdir ${PWD}" \
--define "__check_files ''" \
--define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH }.rpm" \ --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH }.rpm" \
$(PACKAGE).spec $(PACKAGE).spec
@rm -rf build @rm -rf build buildroot
rpm rpms: $(RPMS) rpm rpms: $(RPMS)
# Todd's release rules # Todd's release rules
release: $(PROG) $(PROG).i386 $(PROG).x86_64 $(TARS) $(RPMS) release: $(PROG) $(PROG).i386 $(PROG).x86_64 $(TARS) $(RPMS)
if [ -d $(REL_DIR) ]; then \ if [ -d $(REL_DIR) ]; then \
echo "Makefile: $(REL_DIR) already exists" >&2; \ echo "Makefile: $(REL_DIR) already exists" >&2; \
exit 1; \ exit 1; \
fi fi
mkdir $(REL_DIR) mkdir $(REL_DIR)
cp -p $(PROG) $(PROG).i386 $(PROG).x86_64 $(SRCS) $(OTHER_SRCS) $(REL_DIR ) cp -p $(PROG) $(PROG).i386 $(PROG).x86_64 $(SRCS) $(OTHER_SRCS) $(REL_DIR )
mv $(TARS) $(RPMS) $(REL_DIR) mv $(TARS) $(RPMS) $(REL_DIR)
if [ -e $(i386_DEBUG_RPM) ]; then \ if [ -e $(i386_DEBUG_RPM) ]; then \
mv $(i386_DEBUG_RPM) $(REL_DIR); \ mv $(i386_DEBUG_RPM) $(REL_DIR); \
fi fi
if [ -e $(x86_64_DEBUG_RPM) ]; then \ if [ -e $(x86_64_DEBUG_RPM) ]; then \
mv $(x86_64_DEBUG_RPM) $(REL_DIR); \ mv $(x86_64_DEBUG_RPM) $(REL_DIR); \
fi fi
if [ -e $(i386_DEBUGSOURCE_RPM) ]; then \
mv $(i386_DEBUGSOURCE_RPM) $(REL_DIR); \
fi
if [ -e $(x86_64_DEBUGSOURCE_RPM) ]; then \
mv $(x86_64_DEBUGSOURCE_RPM) $(REL_DIR); \
fi
chmod -w $(REL_DIR)/* chmod -w $(REL_DIR)/*
cp -f -p $(REL_DIR)/*.tar.gz $(REL_DIR)/*.rpm $(WEB_DIR) cp -f -p $(REL_DIR)/*.tar.gz $(REL_DIR)/*.rpm $(WEB_DIR)
rm -f $(PACKAGE).spec rm -f $(PACKAGE).spec
rerelease: rerelease:
rm -rf $(REL_DIR) rm -rf $(REL_DIR)
$(MAKE) -$(MAKEFLAGS) release $(MAKE) -$(MAKEFLAGS) release
 End of changes. 16 change blocks. 
23 lines changed or deleted 34 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)