Skip to content

Commit

Permalink
Add `unifdef' directory to the Automake-based build.
Browse files Browse the repository at this point in the history
`unifdef' is now compiled and installed in C-Reduce's libexec directory,
alongside C-Reduce's other internal tools.

This commit does *not* include changes to the CMake-based build process.
Contributions from CMake users would be welcome.
  • Loading branch information
eeide committed Oct 30, 2015
1 parent 0d550d0 commit 588fab0
Show file tree
Hide file tree
Showing 6 changed files with 712 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Makefile.am
Expand Up @@ -15,7 +15,8 @@ SUBDIRS = \
clex \
creduce \
scripts \
tests
tests \
unifdef

EXTRA_DIST = \
CMakeLists.txt \
Expand Down
3 changes: 2 additions & 1 deletion Makefile.in
Expand Up @@ -362,7 +362,8 @@ SUBDIRS = \
clex \
creduce \
scripts \
tests
tests \
unifdef

EXTRA_DIST = \
CMakeLists.txt \
Expand Down
3 changes: 2 additions & 1 deletion configure
Expand Up @@ -16615,7 +16615,7 @@ fi

###############################################################################

ac_config_files="$ac_config_files Makefile clang_delta/Makefile clex/Makefile creduce/Makefile scripts/Makefile tests/Makefile"
ac_config_files="$ac_config_files Makefile clang_delta/Makefile clex/Makefile creduce/Makefile scripts/Makefile tests/Makefile unifdef/Makefile"

cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
Expand Down Expand Up @@ -17741,6 +17741,7 @@ do
"creduce/Makefile") CONFIG_FILES="$CONFIG_FILES creduce/Makefile" ;;
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"unifdef/Makefile") CONFIG_FILES="$CONFIG_FILES unifdef/Makefile" ;;

*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
Expand Down
1 change: 1 addition & 0 deletions configure.ac
Expand Up @@ -135,6 +135,7 @@ AC_OUTPUT(
creduce/Makefile
scripts/Makefile
tests/Makefile
unifdef/Makefile
)

###############################################################################
Expand Down
26 changes: 26 additions & 0 deletions unifdef/Makefile.am
@@ -0,0 +1,26 @@
## -*- mode: Makefile-Automake -*-
##
## Copyright (c) 2015 The University of Utah
## All rights reserved.
##
## This file is distributed under the University of Illinois Open Source
## License. See the file COPYING for details.

###############################################################################

libexec_PROGRAMS = unifdef

GIT_HASH := $(shell "$(top_srcdir)/git-hash.sh" "$(top_srcdir)" || echo error)
GIT_FLAG = -DGIT_VERSION=\"$(GIT_HASH)\"

unifdef_CPPFLAGS = \
$(GIT_FLAG)

unifdef_SOURCES = \
unifdef.c \
unifdef.h \
version.h

###############################################################################

## End of file.

0 comments on commit 588fab0

Please sign in to comment.