Author: biurrun Date: Thu Oct 29 16:29:27 2009 New Revision: 1416 Log: Move libpisa header files into the libpisa directory. Storing header files away from the corresponding .c files is nonsensical. Added: trunk/libpisa/arp.h (props changed) - copied unchanged from r1412, trunk/include/arp.h trunk/libpisa/cfg.h - copied unchanged from r1412, trunk/include/cfg.h trunk/libpisa/checksum.h (props changed) - copied unchanged from r1412, trunk/include/checksum.h trunk/libpisa/conmgr.h (props changed) - copied unchanged from r1412, trunk/include/conmgr.h trunk/libpisa/crypto.h (props changed) - copied unchanged from r1412, trunk/include/crypto.h trunk/libpisa/ctrlhandler.h (props changed) - copied unchanged from r1412, trunk/include/ctrlhandler.h trunk/libpisa/debug.h (props changed) - copied unchanged from r1412, trunk/include/debug.h trunk/libpisa/global.h - copied unchanged from r1412, trunk/include/global.h trunk/libpisa/hitlist.h - copied unchanged from r1412, trunk/include/hitlist.h trunk/libpisa/log.h (props changed) - copied unchanged from r1412, trunk/include/log.h trunk/libpisa/nat.h (props changed) - copied unchanged from r1412, trunk/include/nat.h trunk/libpisa/packet.h - copied unchanged from r1412, trunk/include/packet.h trunk/libpisa/pisaconf.h (props changed) - copied unchanged from r1412, trunk/include/pisaconf.h trunk/libpisa/scheduler.h (props changed) - copied unchanged from r1412, trunk/include/scheduler.h trunk/libpisa/tunnel.h - copied unchanged from r1412, trunk/include/tunnel.h trunk/libpisa/uthash.h - copied unchanged from r1412, trunk/include/uthash.h trunk/libpisa/util.h - copied unchanged from r1415, trunk/include/util.h Deleted: trunk/include/ Modified: trunk/Makefile.am trunk/configure.ac Modified: trunk/Makefile.am ============================================================================== --- trunk/Makefile.am Thu Oct 29 16:20:50 2009 (r1415) +++ trunk/Makefile.am Thu Oct 29 16:29:27 2009 (r1416) @@ -8,7 +8,7 @@ # For "make dist" EXTRA_DIST += m4 docs/Doxyfile docs/INSTALL EXTRA_DIST += docs/architecture.txt docs/config.txt docs/packettype.txt -EXTRA_DIST += include/*.h +EXTRA_DIST += libpisa/*.h EXTRA_DIST += performance/*.h EXTRA_DIST += tools/caphip tools/delroute EXTRA_DIST += tools/NokiaN810_BEX_Perf.sh tools/switch-ip Modified: trunk/configure.ac ============================================================================== --- trunk/configure.ac Thu Oct 29 16:20:50 2009 (r1415) +++ trunk/configure.ac Thu Oct 29 16:29:27 2009 (r1416) @@ -151,7 +151,7 @@ AC_SUBST(sysconfdir, ${sysconfdir}/pisa) # Set default CFLAGS for the complete project. -AC_SUBST(CFLAGS, "$CFLAGS -g -O2 -Wall -Iinclude -I../include") +AC_SUBST(CFLAGS, "$CFLAGS -g -O2 -Wall -Ilibpisa -I../libpisa") # This is needed to export the _expanded_ value of the variable to config.h. AC_DEFINE_UNQUOTED(PISA_SYSCONFDIR, "$(eval echo $sysconfdir)")