Renamed C++ files to *.hpp and *.cpp
This commit is contained in:
parent
557a515ba6
commit
2fae82f7b7
33
src/Makefile
33
src/Makefile
@ -8,7 +8,7 @@
|
||||
#
|
||||
# RCS information
|
||||
# $Name: $
|
||||
# $Revision: 1.2 $
|
||||
# $Revision: 1.3 $
|
||||
#
|
||||
# Description:
|
||||
# Do NOT change this file! All system specific settings and configs
|
||||
@ -40,10 +40,10 @@ include $(top_srcdir)/config.mk
|
||||
CCHDR =
|
||||
|
||||
# Add library C++ source files to this list
|
||||
CCSRC = exif.cc tags.cc utils.cc
|
||||
CCSRC = exif.cpp tags.cpp utils.cpp
|
||||
|
||||
# Add source files of applications to this list
|
||||
BINSRC = exiftest.cc
|
||||
BINSRC = exiftest.cpp
|
||||
|
||||
# **********************************************************************
|
||||
# Library
|
||||
@ -64,23 +64,23 @@ LDLIBS = $(LIBS) -l$(LIBNAME)
|
||||
SHELL = /bin/sh
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .cc .o .so
|
||||
.SUFFIXES: .cpp .o .so
|
||||
|
||||
.PRECIOUS: %.cc
|
||||
.PRECIOUS: %.cpp
|
||||
|
||||
# Generic variables
|
||||
CCHDR := $(CCHDR) $(CCSRC:.cc=.h)
|
||||
CCOBJ = $(CCSRC:.cc=.o)
|
||||
CCSOBJ = $(CCSRC:.cc=.so)
|
||||
CCHDR := $(CCHDR) $(CCSRC:.cpp=.hpp)
|
||||
CCOBJ = $(CCSRC:.cpp=.o)
|
||||
CCSOBJ = $(CCSRC:.cpp=.so)
|
||||
|
||||
SRC = $(CCSRC)
|
||||
HDR = $(CCHDR)
|
||||
OBJ = $(CCOBJ)
|
||||
SOBJ = $(CCSOBJ)
|
||||
DEP = $(CCSRC:%.cc=.%.d) $(BINSRC:%.cc=.%.d)
|
||||
DEP = $(CCSRC:%.cpp=.%.d) $(BINSRC:%.cpp=.%.d)
|
||||
|
||||
BINOBJ = $(BINSRC:.cc=.o)
|
||||
BINARY = $(BINSRC:.cc=)
|
||||
BINOBJ = $(BINSRC:.cpp=.o)
|
||||
BINARY = $(BINSRC:.cpp=)
|
||||
|
||||
ARCHIVE = lib$(LIBNAME)$(ARCHIVE_SUFFIX)
|
||||
SHAREDLIB = lib$(LIBNAME)$(SHAREDLIB_SUFFIX)
|
||||
@ -119,20 +119,20 @@ endif
|
||||
|
||||
# **********************************************************************
|
||||
# Rules
|
||||
%.o: %.cc
|
||||
%.o: %.cpp
|
||||
$(CXX) $(CXXFLAGS_STATIC) $(CXXDEFS) $(CXXINCS) -c $< -o $@
|
||||
|
||||
%.so: %.cc
|
||||
%.so: %.cpp
|
||||
$(CXX) $(CXXFLAGS_SHARED) $(CXXDEFS) $(CXXINCS) -c $< -o $@
|
||||
|
||||
%.ii: %.cc
|
||||
%.ii: %.cpp
|
||||
set -e; \
|
||||
$(CXXCPP) $(CPPFLAGS) $(CXXDEFS) $(CXXINCS) $< \
|
||||
| sed '/^[ ]*$$/d' > $@
|
||||
|
||||
# generate a makefile with the prerequisites for each source file
|
||||
# (see `info make' for details)
|
||||
.%.d: %.cc
|
||||
.%.d: %.cpp
|
||||
@echo generating $@
|
||||
@set -e; \
|
||||
$(CXXDEP) $(CPPFLAGS) $(CXXDEFS) $(CXXINCS) $< \
|
||||
@ -230,7 +230,7 @@ check:
|
||||
|
||||
mostlyclean:
|
||||
$(RM) core
|
||||
$(RM) $(CCSRC:.cc=.ii)
|
||||
$(RM) $(CCSRC:.cpp=.ii)
|
||||
$(RM) $(OBJ) $(SOBJ) $(BINOBJ)
|
||||
@if test -n "$(CXX_REPOSITORY)"; then \
|
||||
echo "rm -rf $(CXX_REPOSITORY)"; \
|
||||
@ -251,4 +251,3 @@ distclean: clean
|
||||
# This command is intended for maintainers to use; it deletes files
|
||||
# that may need special tools to rebuild.
|
||||
maintainer-clean: uninstall uninstall-lib distclean
|
||||
rm -rf $(top_srcdir)/html/*
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
RCS information
|
||||
$Name: $
|
||||
$Revision: 1.3 $
|
||||
$Revision: 1.1 $
|
||||
*/
|
||||
// *****************************************************************************
|
||||
// included header files
|
||||
#include "exif.h"
|
||||
#include "tags.h"
|
||||
#include "exif.hpp"
|
||||
#include "tags.hpp"
|
||||
|
||||
// + standard includes
|
||||
#include <iostream>
|
||||
@ -8,7 +8,7 @@
|
||||
/*!
|
||||
@file exif.h
|
||||
@brief Encoding and decoding of %Exif data
|
||||
@version $Name: $ $Revision: 1.3 $
|
||||
@version $Name: $ $Revision: 1.1 $
|
||||
@author Andreas Huggel (ahu)
|
||||
@date 09-Jan-03, ahu: created
|
||||
*/
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
// *****************************************************************************
|
||||
// included header files
|
||||
#include "tags.h"
|
||||
#include "tags.hpp"
|
||||
|
||||
// + standard includes
|
||||
#include <string>
|
||||
@ -1,4 +1,4 @@
|
||||
#include "exif.h"
|
||||
#include "exif.hpp"
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
RCS information
|
||||
$Name: $
|
||||
$Revision: 1.2 $
|
||||
$Revision: 1.1 $
|
||||
*/
|
||||
// *****************************************************************************
|
||||
// included header files
|
||||
#include "tags.h"
|
||||
#include "tags.hpp"
|
||||
|
||||
// + standard includes
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
/*!
|
||||
@file tags.h
|
||||
@brief %Exif tag and type information
|
||||
@version $Name: $ $Revision: 1.2 $
|
||||
@version $Name: $ $Revision: 1.1 $
|
||||
@author Andreas Huggel (ahu)
|
||||
@date 15-Jan-03, ahu: created
|
||||
*/
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
// *********************************************************************
|
||||
// included header files
|
||||
#include "utils.h"
|
||||
#include "utils.hpp"
|
||||
|
||||
// + standard includes
|
||||
#include <sys/types.h>
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
// *********************************************************************
|
||||
// included header files
|
||||
#include "utils.h"
|
||||
#include "utils.hpp"
|
||||
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
Loading…
Reference in New Issue
Block a user